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

Commit

Permalink
fix(scenario): NPE when no angular loaded in test page
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimmy Zhuo authored and mhevery committed Sep 11, 2012
1 parent 79941d2 commit 84c13d9
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/ngScenario/Scenario.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down

0 comments on commit 84c13d9

Please sign in to comment.