Tweak the post-form return on bookmarklet if we're not in a popup that we can close

diff --git a/plugins/Bookmark/bookmarkpopup.js b/plugins/Bookmark/bookmarkpopup.js
index 29f314ed06236ec837d0c1e4192fe73d486412db..4904b07e24102a954b942d8354ef4e2048e17054 100644 (file)
--- a/plugins/Bookmark/bookmarkpopup.js
+++ b/plugins/Bookmark/bookmarkpopup.js
@@ -2,6 +2,13 @@ $(document).ready(
     function() {
        var form = $('#form_new_bookmark');
         form.append('<input type="hidden" name="ajax" value="1"/>');
+        function doClose() {
+            self.close();
+            // If in popup blocker situation, we'll have to redirect back.
+            setTimeout(function() {
+                window.location = $('#url').val();
+            }, 100);
+        }
         form.ajaxForm({dataType: 'xml',
                       timeout: '60000',
                        beforeSend: function(formData) {
@@ -11,12 +18,12 @@ $(document).ready(
                        error: function (xhr, textStatus, errorThrown) {
                           form.removeClass('processing');
                           form.find('#submit').removeClass('disabled');
-                          self.close();
+               doClose();
                       },
                        success: function(data, textStatus) {
                           form.removeClass('processing');
                           form.find('#submit').removeClass('disabled');
-                           self.close();
+                           doClose();
                        }});
 
     }