Changeset 6768 for sandbox/2.4.2-expresso1/expressoMail1_2

Timestamp:

07/12/12 14:40:42 (12 years ago)

Author:

acoutinho

Message:

Ticket #2951 - Implementacao da funcionalidade de alarms desktop com suporte a eventos

Location:

sandbox/2.4.2-expresso1/expressoMail1_2

Files:

• index.php (modified) (1 diff)
• js/common_functions.js (modified) (1 diff)

sandbox/2.4.2-expresso1/expressoMail1_2/index.php

@@ -72 +72 @@
                 <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script>
                 <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> -->
-                
+
                 <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script>
-        <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script>
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script>
+                <script type="text/javascript" src="../prototype/modules/calendar/js/desktop.notification.js"></script>
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script>
+                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.alarms.js"></script>
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" >
                 <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script>

sandbox/2.4.2-expresso1/expressoMail1_2/js/common_functions.js

@@ -1241 +1241 @@
     return folderName;
 }
+
+function useDesktopNotification(){
+    //return preferences.notifications;
+    return true;
+}