Changeset 6788 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js

Timestamp:

07/16/12 14:34:56 (12 years ago)

Author:

acoutinho

Message:

Ticket #2951 - Correcoes de bugs e melhorias e finalizacao de codificacao

Location:

sandbox/2.4.2-expresso1/prototype/modules/calendar/js

Files:

• calendar.alarms.js (modified) (1 diff)
• desktop.notification.js (modified) (3 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.alarms.js

@@ -27 +27 @@
                 */
                     desktopNotification.showNotification(false, function(){
+                            console.log('nice');
                                 window.focus();
                                 this.cancel();

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/desktop.notification.js

@@ -9 +9 @@
                         this.installDektopNotificationAddon();
 
-                        if(window.webkitNotifications && window.webkitNotifications.checkPermission())
-                        window.webkitNotifications.requestPermission();
+                        if(window.webkitNotifications && window.webkitNotifications.checkPermission()){
+                             if($.browser.safari){
+                     $.Zebra_Dialog('Deseja instalar o plugin de notificação desktop?', {
+                        'custom_class': 'request-notification-permission',
+                        'type':     'question',
+                        'overlay_opacity': '0.5',
+                        'buttons':  ['Não', 'Sim']
+                    });
 
+                    $('div.ZebraDialog.request-notification-permission a').click(function() {
+                        if($(this).html() == 'Sim')
+                            window.webkitNotifications.requestPermission();       
+                    });
+                }else
+                    window.webkitNotifications.requestPermission();
+            }
                 }
     },
@@ -17 +30 @@
     installDektopNotificationAddon: function(){
 
-        var params = {
-            "Foo": { 
-                        URL: '../prototype/plugins/desktop.notification/html_desktop_notifications-1.0.7-fx.xpi' ,
-                        IconURL:'../prototype/plugins/desktop.notification/desktop-notification.png',
-                        //Hash:'sha1:28857e60d043447c5f4550853f2d40770b326a13',
-                        toString: function () {
-                                return this.URL;
-                        }
-            }
-        };
+        var params = {
+            "Foo": { 
+                        URL: '../prototype/plugins/desktop.notification/html_desktop_notifications-1.0.7-fx.xpi' ,
+                        IconURL:'../prototype/plugins/desktop.notification/desktop-notification.png',
+                        //Hash:'sha1:28857e60d043447c5f4550853f2d40770b326a13',
+                        toString: function () {
+                                return this.URL;
+                        }
+            }
+        };
 
-        InstallTrigger.install(params);
+           InstallTrigger.install(params);
 
-        return false;
+           return false;
     },
 
@@ -73 +86 @@
         .focus(function() { 
             activePage = true;  
-            if(!desktopNotification.verifyComplement()){
+            if(desktopNotification.verifyComplement()){
                         setTimeout(function(){