Check for response.data in setToken, lowered polling to 20ms, no long…

…er clears html inside popup
sahat · Jan 12, 2016 · c787bce · c787bce
1 parent 4ef5c54
commit c787bce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/satellizer.js b/satellizer.js
@@ -337,7 +337,7 @@ if (typeof module !== 'undefined' && typeof exports !== 'undefined' && module.ex
 
           if (!token && response) {
             var tokenRootData = config.tokenRoot && config.tokenRoot.split('.').reduce(function(o, x) { return o[x]; }, response.data);
-            token = tokenRootData ? tokenRootData[config.tokenName] : response.data[config.tokenName];
+            token = tokenRootData ? tokenRootData[config.tokenName] : response.data && response.data[config.tokenName];
           }
 
           if (!token) {
@@ -750,29 +750,23 @@ if (typeof module !== 'undefined' && typeof exports !== 'undefined' && module.ex
               var documentOrigin = document.location.host;
               var popupWindowOrigin = Popup.popupWindow.location.host;
 
-              if (popupWindowOrigin === documentOrigin) {
+              if (popupWindowOrigin === documentOrigin && (Popup.popupWindow.location.search || Popup.popupWindow.location.hash)) {
+                var queryParams = Popup.popupWindow.location.search.substring(1).replace(/\/$/, '');
+                var hashParams = Popup.popupWindow.location.hash.substring(1).replace(/[\/$]/, '');
+                var hash = utils.parseQueryString(hashParams);
+                var qs = utils.parseQueryString(queryParams);
 
-                // Clear the popup's contents
-                Popup.popupWindow.document.removeChild(Popup.popupWindow.document.documentElement);
+                angular.extend(qs, hash);
 
-                if (Popup.popupWindow.location.search || Popup.popupWindow.location.hash) {
-                  var queryParams = Popup.popupWindow.location.search.substring(1).replace(/\/$/, '');
-                  var hashParams = Popup.popupWindow.location.hash.substring(1).replace(/[\/$]/, '');
-                  var hash = utils.parseQueryString(hashParams);
-                  var qs = utils.parseQueryString(queryParams);
-
-                  angular.extend(qs, hash);
-
-                  if (qs.error) {
-                    deferred.reject(qs);
-                  } else {
-                    deferred.resolve(qs);
-                  }
+                if (qs.error) {
+                  deferred.reject(qs);
+                } else {
+                  deferred.resolve(qs);
+                }
 
-                  $interval.cancel(polling);
+                $interval.cancel(polling);
 
-                  Popup.popupWindow.close();
-                }
+                Popup.popupWindow.close();
               }
             } catch (error) {
               // Ignore DOMException: Blocked a frame with origin from accessing a cross-origin frame.
@@ -781,7 +775,7 @@ if (typeof module !== 'undefined' && typeof exports !== 'undefined' && module.ex
             if (!Popup.popupWindow || Popup.popupWindow.closed || Popup.popupWindow.closed === undefined) {
               $interval.cancel(polling);
             }
-          }, 40);
+          }, 20);
 
           return deferred.promise;
         };