From 84c13d96ff6e993b2ee9ff6bf49614fc1d514b04 Mon Sep 17 00:00:00 2001
From: Jimmy Zhuo
Date: Sat, 8 Sep 2012 12:46:24 +0800
Subject: fix(scenario): NPE when no angular loaded in test page

---
 src/ngScenario/Scenario.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

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;
   }
-- 
cgit v1.2.3