Merge branch 'profile' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / js / ostatus.js

diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index bd29b5c0cf8fa41c1cd5a6efc279d74be43e2153..16ea365551a28006985f195f34fec959f374a132 100644 (file)
--- a/plugins/OStatus/js/ostatus.js
+++ b/plugins/OStatus/js/ostatus.js
@@ -24,14 +24,8 @@
  * @note      Everything in here should eventually migrate over to /js/util.js's SN.
  */
 
-SN.Init.OStatusCookie = function() {
-    if (SN.U.StatusNetInstance.Get() === null) {
-        SN.U.StatusNetInstance.Set({RemoteProfile: null});
-    }
-};
-
 SN.U.DialogBox = {
-    Subscribe: function(a) {
+    Subscribe: function (a) {
         var f = a.parent().find('.form_settings');
         if (f.length > 0) {
             f.show();
@@ -41,13 +35,13 @@ SN.U.DialogBox = {
                 type: 'GET',
                 dataType: 'xml',
                 url: a[0].href + ((a[0].href.match(/[\\?]/) === null)?'?':'&') + 'ajax=1',
-                beforeSend: function(formData) {
+                beforeSend: function (formData) {
                     a.addClass('processing');
                 },
                 error: function (xhr, textStatus, errorThrown) {
                     alert(errorThrown || textStatus);
                 },
-                success: function(data, textStatus, xhr) {
+                success: function (data, textStatus, xhr) {
                     if (typeof($('form', data)[0]) != 'undefined') {
                         a.after(document._importNode($('form', data)[0], true));
 
@@ -61,27 +55,17 @@ SN.U.DialogBox = {
                             .find('.submit')
                                 .addClass('submit_dialogbox')
                                 .removeClass('submit')
-                                .bind('click', function() {
+                                .bind('click', function () {
                                     form.addClass('processing');
                                 });
 
-                        form.find('button.close').click(function(){
+                        form.find('button.close').click(function (){
                             form.hide();
 
                             return false;
                         });
 
                         form.find('#profile').focus();
-
-                        if (form.attr('id') == 'form_ostatus_connect') {
-                            SN.Init.OStatusCookie();
-                            form.find('#profile').val(SN.U.StatusNetInstance.Get().RemoteProfile);
-
-                            form.find("[type=submit]").bind('click', function() {
-                                SN.U.StatusNetInstance.Set({RemoteProfile: form.find('#profile').val()});
-                                return true;
-                            });
-                        }
                     }
 
                     a.removeClass('processing');
@@ -91,12 +75,16 @@ SN.U.DialogBox = {
     }
 };
 
-SN.Init.Subscribe = function() {
-    $('.entity_subscribe .entity_remote_subscribe').live('click', function() { SN.U.DialogBox.Subscribe($(this)); return false; });
+SN.Init.Subscribe = function () {
+    $(document).on('click',
+        '.entity_subscribe .entity_remote_subscribe, .entity_tag .entity_remote_tag',
+        function () { SN.U.DialogBox.Subscribe($(this)); return false; });
 };
 
-$(document).ready(function() {
+$(document).ready(function () {
     SN.Init.Subscribe();
 
-    $('.form_remote_authorize').bind('submit', function() { $(this).addClass(SN.C.S.Processing); return true; });
+    $('.form_remote_authorize').bind('submit', function () {
+            $(this).addClass(SN.C.S.Processing); return true;
+        });
 });