Changeset 8167 for trunk/prototype/modules/mail/js

Timestamp:

05/31/13 18:50:29 (11 years ago)

Author:

cristiano

Message:

Ticket #3456 - Otimizacao e implementacao de habilitar/desabilitar funcionalidades no ExpressoMail?

Location:

trunk/prototype/modules/mail/js

Files:

• followupflag.js (modified) (1 diff)
• label.js (modified) (2 diffs)

trunk/prototype/modules/mail/js/followupflag.js

@@ -775 +775 @@
 
 }
-                
-$('#main_table').ready(function(){
-        handlerMessageFilter = function (data) {
-                alarmFollowupflagged(null, data);
-        }
-        /* Busca  nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */
-        cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter);
-});
-
+
+if(preferences['use_alert_filter_criteria'] == "1")
+{
+    $('#main_table').ready(function(){
+        handlerMessageFilter = function (data) {
+            alarmFollowupflagged(null, data);
+        }
+        /* Busca  nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */
+        cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter);
+    });
+}
+
+

trunk/prototype/modules/mail/js/label.js

@@ -199 +199 @@
                                                 winElement.find('.edit').unbind("click").click(editLabel);                              
                                                 winElement.find('.close').click(deleteLabel);
-                                                
-                                                draw_tree_labels();
+                        if( preferences['use_followupflags_and_labels'] == "1" )
+                                                    draw_tree_labels();
                                                 var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+labelEdited.id]}, true);
                                                 updateMessageLabels(msgsReference);
@@ -326 +326 @@
                         .find("li:first")
                         .fadeIn("slow").click(configureLabel);
-                        
-                        draw_tree_labels();
+            if( preferences['use_followupflags_and_labels'] == "1" )
+                            draw_tree_labels();
 
                         $(".label-list-container .label-list li").not(".empty-item").click(function(){