Update desktop notifications logic without yesno field

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index 3811e4f25c4169e1c25f2f3cb45568b9db63256a..511dfdcb3d53399a46434fb5c1d662cfbe1883a4 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -133,47 +133,34 @@
 {{include file="field_checkbox.tpl" field=$desktop_notifications}}
 <script>
 (function(){
-    var elm = $("#id_{{$desktop_notifications.0}}_onoff");
-    var ckbox = $("#id_{{$desktop_notifications.0}}");
-
-    if (getNotificationPermission() === 'granted') {
-        ckbox.val(1);
-        elm.find(".off").addClass("hidden");
-        elm.find(".on").removeClass("hidden");
-    }
+       let $notificationField = $("#div_id_{{$desktop_notifications.0}}");
+       let $notificationCheckbox = $("#id_{{$desktop_notifications.0}}");
+
+       if (getNotificationPermission() === 'granted') {
+               $notificationCheckbox.prop('checked', true);
+       }
        if (getNotificationPermission() === null) {
-               elm.parent(".field.yesno").hide();
+               $notificationField.hide();
        }
 
-    $("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
-
-        if (Notification.permission === 'granted') {
-            localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
-        } else if (Notification.permission === 'denied') {
-            localStorage.setItem('notification-permissions', 'denied');
-
-            ckbox.val(0);
-            elm.find(".on").addClass("hidden");
-            elm.find(".off").removeClass("hidden");
-
-        } else if (Notification.permission === 'default') {
-            Notification.requestPermission(function(choice) {
-                if (choice === 'granted') {
-                    localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
-
-                } else {
-                    localStorage.setItem('notification-permissions', 'denied');
-                    ckbox.val(0);
-                    elm.find(".on").addClass("hidden");
-                    elm.find(".off").removeClass("hidden");
-                }
-            });
-        }
-
-               //console.log(getNotificationPermission());
-
-
-    })
+       $notificationCheckbox.on('change', function(e) {
+               if (Notification.permission === 'granted') {
+                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
+               } else if (Notification.permission === 'denied') {
+                       localStorage.setItem('notification-permissions', 'denied');
+
+                       $notificationCheckbox.prop('checked', false);
+               } else if (Notification.permission === 'default') {
+                       Notification.requestPermission(function(choice) {
+                               if (choice === 'granted') {
+                                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
+                               } else {
+                                       localStorage.setItem('notification-permissions', 'denied');
+                                       $notificationCheckbox.prop('checked', false);
+                               }
+                       });
+               }
+       })
 })();
 </script>
 

diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index 3cf750a68b29f01df1a6e1e39c7d5c37469593b3..1b8481155736ad1f00ce6bd6d004eb7aa827d5ac 100644 (file)
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -195,44 +195,33 @@
                                                        {{include file="field_checkbox.tpl" field=$desktop_notifications}}
                                                        <script type="text/javascript">
                                                                (function(){
-                                                                       var elm = $("#id_{{$desktop_notifications.0}}_onoff");
-                                                                       var ckbox = $("#id_{{$desktop_notifications.0}}");
+                                                                       let $notificationField = $("#div_id_{{$desktop_notifications.0}}");
+                                                                       let $notificationCheckbox = $("#id_{{$desktop_notifications.0}}");
 
                                                                        if (getNotificationPermission() === 'granted') {
-                                                                               ckbox.val(1);
-                                                                               elm.find(".off").addClass("hidden");
-                                                                               elm.find(".on").removeClass("hidden");
+                                                                               $notificationCheckbox.prop('checked', true);
                                                                        }
                                                                        if (getNotificationPermission() === null) {
-                                                                               elm.parent(".field.yesno").hide();
+                                                                               $notificationField.hide();
                                                                        }
 
-                                                                       $("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
-
+                                                                       $notificationCheckbox.on('change', function(e){
                                                                                if (Notification.permission === 'granted') {
-                                                                                       localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
+                                                                                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
                                                                                } else if (Notification.permission === 'denied') {
                                                                                        localStorage.setItem('notification-permissions', 'denied');
 
-                                                                                       ckbox.val(0);
-                                                                                       elm.find(".on").addClass("hidden");
-                                                                                       elm.find(".off").removeClass("hidden");
-
+                                                                                       $notificationCheckbox.prop('checked', false);
                                                                                } else if (Notification.permission === 'default') {
                                                                                        Notification.requestPermission(function(choice) {
                                                                                                if (choice === 'granted') {
-                                                                                                       localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
-
+                                                                                                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
                                                                                                } else {
                                                                                                        localStorage.setItem('notification-permissions', 'denied');
-                                                                                                       ckbox.val(0);
-                                                                                                       elm.find(".on").addClass("hidden");
-                                                                                                       elm.find(".off").removeClass("hidden");
+                                                                                                       $notificationCheckbox.prop('checked', false);
                                                                                                }
                                                                                        });
                                                                                }
-
-                                                                               //console.log(getNotificationPermission());
                                                                        })
                                                                })();
                                                        </script>