Duplicated "hide-friends" setting removed

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

diff --git a/view/js/main.js b/view/js/main.js
index b7026690036868a3f9b537c672e37e40f435b553..41bae7cf23e46d3f058b191521cfa0c7eef23b57 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -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 = '';
@@ -349,7 +332,7 @@ $(function() {
                        });
                }
 
-               var notif = data['notify'];
+               var notif = data['notification'];
                if (notif > 0) {
                        $("#nav-notifications-linkmenu").addClass("on");
                } else {
@@ -948,7 +931,7 @@ function checkboxhighlight(box) {
        }
 }
 
-function notifyMarkAll() {
+function notificationMarkAll() {
        $.get('notification/mark/all', function(data) {
                if (timer) {
                        clearTimeout(timer);