diff options
| author | Jimmy Zhuo | 2012-09-08 12:46:24 +0800 |
|---|---|---|
| committer | Misko Hevery | 2012-09-11 16:12:40 -0700 |
| commit | 84c13d96ff6e993b2ee9ff6bf49614fc1d514b04 (patch) | |
| tree | 1d7f4705af8c898a779b37044299123ccd9f795e /src | |
| parent | 79941d2527c0d9f06f9a6a4ab05fb341076a4276 (diff) | |
| download | angular.js-84c13d96ff6e993b2ee9ff6bf49614fc1d514b04.tar.bz2 | |
fix(scenario): NPE when no angular loaded in test page
Diffstat (limited to 'src')
| -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; } |
