Changeset 6753 for sandbox/2.4.2-expresso1/expressoMail1_2/js

Timestamp:

07/11/12 10:08:55 (12 years ago)

Author:

thiago

Message:

Ticket #2951 - Agora existe uma preferencia para o usuario.

File:

• sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js (modified) (4 diffs)

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

@@ -552 +552 @@
 
 function auto_refresh(){
-        refresh(preferences.alert_new_msg);
+        refresh(preferences.alert_new_msg, preferences.notifications);
         setTimeout('auto_refresh()', time_refresh);
 }
@@ -594 +594 @@
     $(function() {
                 var notifier = new Notifier();
+                /*if(notifier.HasSupport){
+                        alert("Seu navegador não dá suporte!");
+                        //firefox/downloads/latest/221523/addon-221523-latest.xpi?src=dp-btn-primary
+                }*/
+                
                 if (window.webkitNotifications.checkPermission() != 0){
                         notifier.RequestPermission();
@@ -608 +613 @@
 var auxNotification;
 
-function refresh(alert_new_msg){
+function refresh(alert_new_msg, notification){
+
         getFromAlertRules();
         var handler_refresh = function(data){
@@ -759 +765 @@
                         if(parseInt(preferences.use_shortcuts))
                                 select_msg("null","reload_msg","null");
-
-                        if(parseInt(alert_new_msg) && (data.new_msgs > 0 || notifyNewMessage.length > 0) ){
+                
+                        if(parseInt(alert_new_msg) && data.new_msgs > 0)
+                                alert(data['new_msgs'] > 1 ? get_lang("You have %1 new messages", data['new_msgs']) + "!" : get_lang("You have 1 new message") +"!");
+                        
+                        
+                        if(parseInt(notification)  && (data.new_msgs > 0 || notifyNewMessage.length > 0) ){
                         
                         for(var i=0; i<data.length; i++){