Merge branch 'master' into testing

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

diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index 148a05f6f642586ed1702fd6d3751be52615e42d..59d9f23f0510b6027976e087702517cf7db2c77a 100644 (file)
--- a/plugins/OStatus/js/ostatus.js
+++ b/plugins/OStatus/js/ostatus.js
@@ -24,35 +24,9 @@
  * @note      Everything in here should eventually migrate over to /js/util.js's SN.
  */
 
-SN.C.S.StatusNetInstance = 'StatusNetInstance';
-
-SN.U.StatusNetInstance = {
-    Set: function(value) {
-        $.cookie(
-            SN.C.S.StatusNetInstance,
-            JSON.stringify(value),
-            {
-                path: '/',
-                expires: SN.U.GetFullYear(2029, 0, 1)
-            });
-    },
-
-    Get: function() {
-        var cookieValue = $.cookie(SN.C.S.StatusNetInstance);
-        if (cookieValue !== null) {
-            return JSON.parse(cookieValue);
-        }
-        return null;
-    },
-
-    Delete: function() {
-        $.cookie(SN.C.S.StatusNetInstance, null);
-    }
-};
-
 SN.Init.OStatusCookie = function() {
     if (SN.U.StatusNetInstance.Get() === null) {
-        SN.U.StatusNetInstance.Set({profile: null});
+        SN.U.StatusNetInstance.Set({RemoteProfile: null});
     }
 };
 
@@ -63,11 +37,10 @@ SN.U.DialogBox = {
             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 + ((a[0].href.match(/[\\?]/) === null)?'?':'&') + 'ajax=1',
                 beforeSend: function(formData) {
                     a.addClass('processing');
                 },
@@ -102,10 +75,10 @@ SN.U.DialogBox = {
 
                         if (form.attr('id') == 'form_ostatus_connect') {
                             SN.Init.OStatusCookie();
-                            form.find('#profile').val(SN.U.StatusNetInstance.Get().profile);
+                            form.find('#profile').val(SN.U.StatusNetInstance.Get().RemoteProfile);
 
                             form.find("[type=submit]").bind('click', function() {
-                                SN.U.StatusNetInstance.Set({profile: form.find('#profile').val()});
+                                SN.U.StatusNetInstance.Set({RemoteProfile: form.find('#profile').val()});
                                 return true;
                             });
                         }
@@ -119,9 +92,12 @@ SN.U.DialogBox = {
 };
 
 SN.Init.Subscribe = function() {
-    $('.entity_subscribe .entity_remote_subscribe').live('click', function() { SN.U.DialogBox.Subscribe($(this)); return false; });
+    $('.entity_subscribe .entity_remote_subscribe, .entity_tag .entity_remote_tag')
+        .live('click', function() { SN.U.DialogBox.Subscribe($(this)); return false; });
 };
 
 $(document).ready(function() {
     SN.Init.Subscribe();
+
+    $('.form_remote_authorize').bind('submit', function() { $(this).addClass(SN.C.S.Processing); return true; });
 });