Merge branch 'Fixes/0.2.4' into develop

oauth-io · Aug 4, 2014 · 850aac1 · 850aac1
2 parents 012b01d + da75c04
commit 850aac1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/www/coffee/lib/oauth.coffee b/www/coffee/lib/oauth.coffee
@@ -193,6 +193,9 @@ module.exports = (window, document, jQuery, navigator) ->
 								opts.callback new Error("unable to receive token")
 							defer?.reject new Error("unable to receive token")
 						return
+					wnd.addEventListener "exit", () ->
+						defer?.reject new Error("The popup was closed")
+						opts.callback new Error("The popup was closed")  if opts.callback and typeof opts.callback == "function"
 
 					return defer?.promise()
 				clearCache: (provider) ->

diff --git a/www/dist/oauth.js b/www/dist/oauth.js
@@ -249,6 +249,14 @@ module.exports = function(window, document, jQuery, navigator) {
               }
             }
           });
+          wnd.addEventListener("exit", function() {
+            if (defer != null) {
+              defer.reject(new Error("The popup was closed"));
+            }
+            if (opts.callback && typeof opts.callback === "function") {
+              return opts.callback(new Error("The popup was closed"));
+            }
+          });
           return defer != null ? defer.promise() : void 0;
         },
         clearCache: function(provider) {

diff --git a/www/dist/oauth.min.js b/www/dist/oauth.min.js
diff --git a/www/js/lib/oauth.js b/www/js/lib/oauth.js
@@ -240,6 +240,14 @@ module.exports = function(window, document, jQuery, navigator) {
               }
             }
           });
+          wnd.addEventListener("exit", function() {
+            if (defer != null) {
+              defer.reject(new Error("The popup was closed"));
+            }
+            if (opts.callback && typeof opts.callback === "function") {
+              return opts.callback(new Error("The popup was closed"));
+            }
+          });
           return defer != null ? defer.promise() : void 0;
         },
         clearCache: function(provider) {