Duplicated "hide-friends" setting removed

[friendica.git] / view / js / main.js

diff --git a/view/js/main.js b/view/js/main.js
index a5aa6d434eb408fe4e0c81e1b2a5d276b3f4b372..41bae7cf23e46d3f058b191521cfa0c7eef23b57 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -40,7 +40,7 @@ function initWidget(inflated, deflated) {
        if (!elInf || !elDef) {
                return;
        }
-       if (localStorage.getItem(window.location.pathname + ":" + inflated) != "none") {
+       if (localStorage.getItem(window.location.pathname.split("/")[1] + ":" + inflated) != "none") {
                elInf.style.display = "block";
                elDef.style.display = "none";
        } else {
@@ -60,11 +60,11 @@ function openCloseWidget(inflated, deflated) {
        if (window.getComputedStyle(elInf).display === "none") {
                elInf.style.display = "block";
                elDef.style.display = "none";
-               localStorage.setItem(window.location.pathname + ":" + inflated, "block");
+               localStorage.setItem(window.location.pathname.split("/")[1] + ":" + inflated, "block");
        } else {
                elInf.style.display = "none";
                elDef.style.display = "block";
-               localStorage.setItem(window.location.pathname + ":" + inflated, "none");
+               localStorage.setItem(window.location.pathname.split("/")[1] + ":" + inflated, "none");
        }
 }
 
@@ -160,23 +160,6 @@ $(function() {
                $(textarea).trigger('change');
        });
 
-       /* setup onoff widgets */
-       $(".onoff input").each(function() {
-               val = $(this).val();
-               id = $(this).attr("id");
-               $("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
-       });
-
-       $(".onoff > a").click(function(event) {
-               event.preventDefault();
-               var input = $(this).siblings("input");
-               var val = 1-input.val();
-               var id = input.attr("id");
-               $("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
-               $("#"+id+"_onoff ." + (val == 1 ? "on":"off")).removeClass("hidden");
-               input.val(val);
-       });
-
        /* popup menus */
        function close_last_popup_menu() {
                if (last_popup_menu) {
@@ -245,7 +228,7 @@ $(function() {
                        window.location.href=window.location.href
                }
 
-               ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
+               ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notification'].forEach(function(type) {
                        var number = data[type];
                        if (number == 0) {
                                number = '';
@@ -299,19 +282,19 @@ $(function() {
                        var notification_id = 0;
 
                        // Insert notifs into the notifications-menu
-                       $(data.notifications).each(function(key, notif) {
-                               var text = notif.message.format('<span class="contactname">' + notif.name + '</span>');
-                               var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>');
-                               var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen";
+                       $(data.notifications).each(function(key, notification) {
+                               var text = notification.message.format('<span class="contactname">' + notification.name + '</span>');
+                               var contact = ('<a href="' + notification.url + '"><span class="contactname">' + notification.name + '</span></a>');
+                               var seenclass = (notification.seen == 1) ? "notification-seen" : "notification-unseen";
                                var html = notifications_tpl.format(
-                                       notif.href,                     // {0}  // link to the source
-                                       notif.photo,                    // {1}  // photo of the contact
+                                       notification.href,                     // {0}  // link to the source
+                                       notification.photo,                    // {1}  // photo of the contact
                                        text,                           // {2}  // preformatted text (autor + text)
-                                       notif.date,                     // {3}  // date of notification (time ago)
+                                       notification.date,                     // {3}  // date of notification (time ago)
                                        seenclass,                      // {4}  // visited status of the notification
-                                       new Date(notif.timestamp*1000), // {5}  // date of notification
-                                       notif.url,                      // {6}  // profile url of the contact
-                                       notif.message.format(contact),  // {7}  // preformatted html (text including author profile url)
+                                       new Date(notification.timestamp*1000), // {5}  // date of notification
+                                       notification.url,                      // {6}  // profile url of the contact
+                                       notification.message.format(contact),  // {7}  // preformatted html (text including author profile url)
                                        ''                              // {8}  // Deprecated
                                );
                                nnm.append(html);
@@ -349,7 +332,7 @@ $(function() {
                        });
                }
 
-               var notif = data['notify'];
+               var notif = data['notification'];
                if (notif > 0) {
                        $("#nav-notifications-linkmenu").addClass("on");
                } else {
@@ -498,7 +481,7 @@ function insertBBCodeInTextarea(BBCode, textarea) {
 
 function NavUpdate() {
        if (!stopped) {
-               var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');
+               var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&uid=' + localUser : '');
                $.get(pingCmd, function(data) {
                        if (data.result) {
                                // send nav-update event
@@ -948,8 +931,8 @@ function checkboxhighlight(box) {
        }
 }
 
-function notifyMarkAll() {
-       $.get('notify/mark/all', function(data) {
+function notificationMarkAll() {
+       $.get('notification/mark/all', function(data) {
                if (timer) {
                        clearTimeout(timer);
                }
@@ -980,7 +963,7 @@ Array.prototype.remove = function(item) {
 
 function previewTheme(elm) {
        theme = $(elm).val();
-       $.getJSON('pretheme?f=&theme=' + theme,function(data) {
+       $.getJSON('pretheme?theme=' + theme,function(data) {
                        $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
        });