diff options
| author | Jimmy Zhuo | 2012-09-08 12:46:24 +0800 |
|---|---|---|
| committer | Misko Hevery | 2012-09-11 16:19:44 -0700 |
| commit | 82f4b99d994bd2dcb970c38e86a8ca0249c167bc (patch) | |
| tree | 83a3d3b483be71f611bf2be65620016d1f1a36f4 | |
| parent | 7210b7ae1d50a4a65fef24c2009b0da927ccfdc1 (diff) | |
| download | angular.js-82f4b99d994bd2dcb970c38e86a8ca0249c167bc.tar.bz2 | |
fix(scenario): NPE when no angular loaded in test page
| -rw-r--r-- | src/ngScenario/Scenario.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js index 19da6444..4833e629 100644 --- a/src/ngScenario/Scenario.js +++ b/src/ngScenario/Scenario.js @@ -294,10 +294,11 @@ function browserTrigger(element, type, keys) { iframe = _jQuery('#application iframe')[0], appWindow = iframe ? iframe.contentWindow : window, fakeProcessDefault = true, - finalProcessDefault; + finalProcessDefault, + angular = appWindow.angular || {}; // igor: temporary fix for https://bugzilla.mozilla.org/show_bug.cgi?id=684208 - appWindow.angular['ff-684208-preventDefault'] = false; + angular['ff-684208-preventDefault'] = false; evnt.preventDefault = function() { fakeProcessDefault = false; return originalPreventDefault.apply(evnt, arguments); @@ -307,9 +308,9 @@ function browserTrigger(element, type, keys) { pressed('shift'), pressed('meta'), 0, element); element.dispatchEvent(evnt); - finalProcessDefault = !(appWindow.angular['ff-684208-preventDefault'] || !fakeProcessDefault); + finalProcessDefault = !(angular['ff-684208-preventDefault'] || !fakeProcessDefault); - delete appWindow.angular['ff-684208-preventDefault']; + delete angular['ff-684208-preventDefault']; return finalProcessDefault; } |
