Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 84c13d9

Browse files
Jimmy Zhuomhevery
Jimmy Zhuo
authored andcommitted
fix(scenario): NPE when no angular loaded in test page
1 parent 79941d2 commit 84c13d9

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/ngScenario/Scenario.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,11 @@ function browserTrigger(element, type, keys) {
294294
iframe = _jQuery('#application iframe')[0],
295295
appWindow = iframe ? iframe.contentWindow : window,
296296
fakeProcessDefault = true,
297-
finalProcessDefault;
297+
finalProcessDefault,
298+
angular = appWindow.angular || {};
298299

299300
// igor: temporary fix for https://bugzilla.mozilla.org/show_bug.cgi?id=684208
300-
appWindow.angular['ff-684208-preventDefault'] = false;
301+
angular['ff-684208-preventDefault'] = false;
301302
evnt.preventDefault = function() {
302303
fakeProcessDefault = false;
303304
return originalPreventDefault.apply(evnt, arguments);
@@ -307,9 +308,9 @@ function browserTrigger(element, type, keys) {
307308
pressed('shift'), pressed('meta'), 0, element);
308309

309310
element.dispatchEvent(evnt);
310-
finalProcessDefault = !(appWindow.angular['ff-684208-preventDefault'] || !fakeProcessDefault);
311+
finalProcessDefault = !(angular['ff-684208-preventDefault'] || !fakeProcessDefault);
311312

312-
delete appWindow.angular['ff-684208-preventDefault'];
313+
delete angular['ff-684208-preventDefault'];
313314

314315
return finalProcessDefault;
315316
}

0 commit comments

Comments
 (0)