summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-22 17:05:43 +0100
committerSarven Capadisli <csarven@status.net>2010-02-22 17:05:43 +0100
commite6ce04cbce08b9f7d0d74f6fbf86e199af8b865d (patch)
tree27d07568efa3bdeb24bd301d7b7a018bf70327c9 /plugins
parent8ccc9e2c386824c71aca2da7ae311d2787338483 (diff)
Generalised Subscription XHR dialogbox
Diffstat (limited to 'plugins')
-rw-r--r--plugins/OStatus/js/ostatus.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index 671795558..4b4c32910 100644
--- a/plugins/OStatus/js/ostatus.js
+++ b/plugins/OStatus/js/ostatus.js
@@ -1,14 +1,15 @@
SN.U.DialogBox = {
Subscribe: function(a) {
- var f = a.parent().find('#form_ostatus_connect');
+ var f = a.parent().find('.form_settings');
if (f.length > 0) {
f.show();
}
else {
+ a[0].href = (a[0].href.match(/[\\?]/) == null) ? a[0].href+'?' : a[0].href+'&';
$.ajax({
type: 'GET',
dataType: 'xml',
- url: a[0].href+'&ajax=1',
+ url: a[0].href+'ajax=1',
beforeSend: function(formData) {
a.addClass('processing');
},
@@ -19,7 +20,7 @@ SN.U.DialogBox = {
if (typeof($('form', data)[0]) != 'undefined') {
a.after(document._importNode($('form', data)[0], true));
- var form = a.parent().find('#form_ostatus_connect');
+ var form = a.parent().find('.form_settings');
form
.addClass('dialogbox')
@@ -40,6 +41,7 @@ SN.U.DialogBox = {
});
form.find('#acct').focus();
+ form.find('#profile').focus();
}
a.removeClass('processing');
@@ -50,11 +52,9 @@ SN.U.DialogBox = {
};
SN.Init.Subscribe = function() {
- $('.entity_subscribe a').live('click', function() { SN.U.DialogBox.Subscribe($(this)); return false; });
+ $('.entity_subscribe .entity_remote_subscribe').live('click', function() { SN.U.DialogBox.Subscribe($(this)); return false; });
};
$(document).ready(function() {
- if ($('.entity_subscribe .entity_remote_subscribe').length > 0) {
- SN.Init.Subscribe();
- }
+ SN.Init.Subscribe();
});