GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber 2010-12-30 16:14:41 -08:00
parent b00a3cd4e4
commit b71a09a1a9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Bookmark/bookmarkpopup.js
View File

@ -2,6 +2,13 @@ $(document).ready(
function() { function() {
var form = $('#form_new_bookmark'); var form = $('#form_new_bookmark');
form.append('<input type="hidden" name="ajax" value="1"/>'); 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', form.ajaxForm({dataType: 'xml',
timeout: '60000', timeout: '60000',
beforeSend: function(formData) { beforeSend: function(formData) {
@ -11,12 +18,12 @@ $(document).ready(
error: function (xhr, textStatus, errorThrown) { error: function (xhr, textStatus, errorThrown) {
form.removeClass('processing'); form.removeClass('processing');
form.find('#submit').removeClass('disabled'); form.find('#submit').removeClass('disabled');
self.close(); doClose();
}, },
success: function(data, textStatus) { success: function(data, textStatus) {
form.removeClass('processing'); form.removeClass('processing');
form.find('#submit').removeClass('disabled'); form.find('#submit').removeClass('disabled');
self.close(); doClose();
}}); }});
} }