From: Sarven Capadisli <csarven@status.net>
Date: Wed, 24 Feb 2010 15:35:20 +0000 (+0100)
Subject: Moved StatusNetInstance into SN in util.js
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f45273d5303e98430a02d4480278c24733a5be9;p=quix0rs-gnu-social.git

Moved StatusNetInstance into SN in util.js
---

diff --git a/js/util.js b/js/util.js
index 3623337b9f..78533ab731 100644
--- a/js/util.js
+++ b/js/util.js
@@ -54,7 +54,8 @@ var SN = { // StatusNet
             NoticeGeoName: 'notice_data-geo_name',
             NoticeDataGeo: 'notice_data-geo',
             NoticeDataGeoCookie: 'notice_data-geo_cookie',
-            NoticeDataGeoSelected: 'notice_data-geo_selected'
+            NoticeDataGeoSelected: 'notice_data-geo_selected',
+            StatusNetInstance:'StatusNetInstance'
         }
     },
 
@@ -670,6 +671,35 @@ var SN = { // StatusNet
             date.setFullYear(year, month, day);
 
             return date;
+        },
+
+        StatusNetInstance: {
+            Set: function(value) {
+                var SNI = SN.U.StatusNetInstance.Get();
+                if (SNI !== null) {
+                    value = $.extend(SNI, 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);
+            }
         }
     },
 
diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index 3637b8725b..bd29b5c0cf 100644
--- 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});
     }
 };
 
@@ -101,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;
                             });
                         }