try/catch run block for cross-original exception

sahat · Sep 10, 2014 · 7789031 · 7789031
1 parent 4fff1ed
commit 7789031
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/examples/client/vendor/satellizer.js b/examples/client/vendor/satellizer.js
@@ -539,16 +539,20 @@
     .run(['$window', '$location', 'satellizer.utils', function($window, $location, utils) {
       var params = $window.location.search.substring(1);
       var qs = Object.keys($location.search()).length ? $location.search() : utils.parseQueryString(params);
-
-      if ($window.opener && $window.opener.location.origin === $window.location.origin) {
-        if (qs.oauth_token && qs.oauth_verifier) {
-          $window.opener.postMessage({ oauth_token: qs.oauth_token, oauth_verifier: qs.oauth_verifier }, $window.location.origin);
-        } else if (qs.code) {
-          $window.opener.postMessage({ code: qs.code }, $window.location.origin);
-        } else if (qs.error) {
-          $window.opener.postMessage({ error: qs.error }, $window.location.origin);
+      try {
+        if ($window.opener && $window.opener.location.origin === $window.location.origin) {
+          if (qs.oauth_token && qs.oauth_verifier) {
+            $window.opener.postMessage({ oauth_token: qs.oauth_token, oauth_verifier: qs.oauth_verifier }, $window.location.origin);
+          } else if (qs.code) {
+            $window.opener.postMessage({ code: qs.code }, $window.location.origin);
+          } else if (qs.error) {
+            $window.opener.postMessage({ error: qs.error }, $window.location.origin);
+          }
         }
+      } catch(ex) {
+
       }
+
     }]);
 
 })(window, window.angular);
diff --git a/satellizer.js b/satellizer.js
@@ -539,16 +539,20 @@
     .run(['$window', '$location', 'satellizer.utils', function($window, $location, utils) {
       var params = $window.location.search.substring(1);
       var qs = Object.keys($location.search()).length ? $location.search() : utils.parseQueryString(params);
-
-      if ($window.opener && $window.opener.location.origin === $window.location.origin) {
-        if (qs.oauth_token && qs.oauth_verifier) {
-          $window.opener.postMessage({ oauth_token: qs.oauth_token, oauth_verifier: qs.oauth_verifier }, $window.location.origin);
-        } else if (qs.code) {
-          $window.opener.postMessage({ code: qs.code }, $window.location.origin);
-        } else if (qs.error) {
-          $window.opener.postMessage({ error: qs.error }, $window.location.origin);
+      try {
+        if ($window.opener && $window.opener.location.origin === $window.location.origin) {
+          if (qs.oauth_token && qs.oauth_verifier) {
+            $window.opener.postMessage({ oauth_token: qs.oauth_token, oauth_verifier: qs.oauth_verifier }, $window.location.origin);
+          } else if (qs.code) {
+            $window.opener.postMessage({ code: qs.code }, $window.location.origin);
+          } else if (qs.error) {
+            $window.opener.postMessage({ error: qs.error }, $window.location.origin);
+          }
         }
+      } catch(ex) {
+
       }
+
     }]);
 
 })(window, window.angular);
diff --git a/satellizer.min.js b/satellizer.min.js