From 3ffcddde2356966986c9cff10f8009b5e1452b2d Mon Sep 17 00:00:00 2001
From: Alex Vasilenko <aa.vasilenko@gmail.com>
Date: Fri, 28 Sep 2012 14:09:01 +0300
Subject: [PATCH 1/3] amd support optional callback instead of tracking closed
 state

---
 src/jquery.oauthpopup.js | 64 +++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/jquery.oauthpopup.js b/src/jquery.oauthpopup.js
index d06b2e5..f685dc5 100644
--- a/src/jquery.oauthpopup.js
+++ b/src/jquery.oauthpopup.js
@@ -7,25 +7,47 @@
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  */
-(function($){
-    //  inspired by DISQUS
-    $.oauthpopup = function(options)
-    {
-        if (!options || !options.path) {
-            throw new Error("options.path must not be empty");
-        }
-        options = $.extend({
-            windowName: 'ConnectWithOAuth' // should not include space for IE
-          , windowOptions: 'location=0,status=0,width=800,height=400'
-          , callback: function(){ window.location.reload(); }
-        }, options);
-
-        var oauthWindow   = window.open(options.path, options.windowName, options.windowOptions);
-        var oauthInterval = window.setInterval(function(){
-            if (oauthWindow.closed) {
-                window.clearInterval(oauthInterval);
-                options.callback();
+(function(factory) {
+    // Support three module loading scenarios
+    if (typeof define === 'function' && define['amd']) {
+        // AMD anonymous module
+        define(['jquery'], factory);
+    } else {
+        // No module loader (plain <script> tag) - put directly in global namespace
+        factory(jQuery);
+    }
+})(function($){
+    (function($,window){
+        //  inspired by DISQUS
+        $.oauthpopup = function(options)
+        {
+            if (!options || !options.path) {
+                throw new Error("options.path must not be empty");
             }
-        }, 1000);
-    };
-})(jQuery);
+            options = $.extend({
+                windowName: 'ConnectWithOAuth' // should not include space for IE
+              , windowOptions: 'location=0,status=0,width=800,height=400'
+              , callback: function(){ window.location.reload(); }
+            }, options);
+
+            var oauthWindow = window.open(options.path, options.windowName, options.windowOptions),
+                oauthInterval = 0,
+                callback = function() {
+                    if (oauthInterval > 0) {
+                        window.clearInterval(oauthInterval);
+                    }
+                    if (!oauthWindow.closed) {
+                        oauthWindow.close();
+                    }
+                    //pass all arguments to callback
+                    options.callback.apply(null, arguments);
+                };
+            oauthWindow.callback = callback;
+            oauthInterval = window.setInterval(function(){
+                if (oauthWindow.closed) {
+                    callback();
+                }
+            }, 1000);
+        };
+    })($,window)
+});

From 38f22321d28a1efcc332f8fef7be99b63ab9cb4e Mon Sep 17 00:00:00 2001
From: Alex Vasilenko <aa.vasilenko@gmail.com>
Date: Tue, 2 Oct 2012 18:20:08 +0300
Subject: [PATCH 2/3] more elegant callback injection

---
 src/jquery.oauthpopup.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/jquery.oauthpopup.js b/src/jquery.oauthpopup.js
index f685dc5..48499d4 100644
--- a/src/jquery.oauthpopup.js
+++ b/src/jquery.oauthpopup.js
@@ -42,8 +42,17 @@
                     //pass all arguments to callback
                     options.callback.apply(null, arguments);
                 };
-            oauthWindow.callback = callback;
-            oauthInterval = window.setInterval(function(){
+            $(oauthWindow.document).ready(function(){
+                var setPopupPropertiesInterval = setInterval(
+                    function setPopupProperties() {
+                        oauthWindow.callback = callback;
+                        if (oauthWindow.closed || oauthWindow.callback) {
+                            clearInterval(setPopupPropertiesInterval);
+                        }
+                    }, 1
+                );
+            });
+            oauthInterval = setInterval(function(){
                 if (oauthWindow.closed) {
                     callback();
                 }

From fb1df5dc64f0359f5ee147344360c6b84dbe767c Mon Sep 17 00:00:00 2001
From: Alex Vasilenko <aa.vasilenko@gmail.com>
Date: Tue, 2 Oct 2012 18:40:10 +0300
Subject: [PATCH 3/3] instead of direct callback injection use opener callback

---
 src/jquery.oauthpopup.js | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/jquery.oauthpopup.js b/src/jquery.oauthpopup.js
index 48499d4..9320ae9 100644
--- a/src/jquery.oauthpopup.js
+++ b/src/jquery.oauthpopup.js
@@ -31,27 +31,18 @@
             }, options);
 
             var oauthWindow = window.open(options.path, options.windowName, options.windowOptions),
-                oauthInterval = 0,
-                callback = function() {
-                    if (oauthInterval > 0) {
-                        window.clearInterval(oauthInterval);
-                    }
-                    if (!oauthWindow.closed) {
-                        oauthWindow.close();
-                    }
-                    //pass all arguments to callback
-                    options.callback.apply(null, arguments);
-                };
-            $(oauthWindow.document).ready(function(){
-                var setPopupPropertiesInterval = setInterval(
-                    function setPopupProperties() {
-                        oauthWindow.callback = callback;
-                        if (oauthWindow.closed || oauthWindow.callback) {
-                            clearInterval(setPopupPropertiesInterval);
-                        }
-                    }, 1
-                );
-            });
+                oauthInterval = 0;
+            oauthCallback = function() {
+                if (oauthInterval > 0) {
+                    window.clearInterval(oauthInterval);
+                }
+                if (!oauthWindow.closed) {
+                    oauthWindow.close();
+                }
+                //pass all arguments to callback
+                options.callback.apply(null, arguments);
+                window.oauthCallback = null;
+            };
             oauthInterval = setInterval(function(){
                 if (oauthWindow.closed) {
                     callback();