Changeset 8167 for trunk/prototype

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

Files:

• filters/edit-filter.ejs (modified) (1 diff)
• filters/filters.js (modified) (3 diffs)
• mail/js/followupflag.js (modified) (1 diff)
• mail/js/label.js (modified) (2 diffs)
• mail/templates/detailedfoldertree.ejs (modified) (2 diffs)

trunk/prototype/modules/filters/edit-filter.ejs

@@ -128 +128 @@
                                         %>
                                 </select>
-                                <input type="checkbox" name="actionType[]" value="alertMessage" class="alertMessage"/>
-                                <label><%= get_lang("Alert message filter by sender")%></label>
+                <%
+                if(preferences['use_alert_filter_criteria'] == "1")
+                {%>
+                    <input type="checkbox" name="actionType[]" value="alertMessage" class="alertMessage"/>
+                    <label><%= get_lang("Alert message filter by sender")%></label>
+                <%}%>
                         </fieldset>
                         <fieldset>

trunk/prototype/modules/filters/filters.js

@@ -2 +2 @@
  * Retorna as regras por remetente e que o usuário deseja ser avisado 
  */
-function getFromAlertRules() { 
-        var filters = DataLayer.get("filter");
-        fromRules = [];
-        var alertMessage;
-        var active;
-        for (var index in filters) {
-                alertMessage = filters[index]['alertMessage'];          
-                active = filters[index]['enabled'];
-                for(var criterias in filters[index]['actions']) {
-                        if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true')
-                                fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter'];
-                }
-        }
-        return fromRules;
+function getFromAlertRules() {
+    fromRules = [];
+    if(preferences['use_alert_filter_criteria'] == "1")
+    {
+        var filters = DataLayer.get("filter");
+        var alertMessage;
+        var active;
+        for (var index in filters) {
+            alertMessage = filters[index]['alertMessage'];
+            active = filters[index]['enabled'];
+            for(var criterias in filters[index]['actions']) {
+                if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true')
+                    fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter'];
+            }
+        }
+
+    }
+    return fromRules;
 }
 
@@ -401 +405 @@
 });
 
-
-fromRules = getFromAlertRules();
+if(preferences['use_alert_filter_criteria'] == "1")
+{
+    fromRules = getFromAlertRules();
+}
 
 var BASE_PATH = '../prototype/';
@@ -1042 +1048 @@
                 }
         }
-        $.each(fromRules, function(index, value) {
-                if(value == folder){
-                        for(var i=0; i < filters_c['criteria'].length; i++){
-                                if(filters_c['criteria'][i].field == 'from'){
-                                        from = filters_c['criteria'][i].value;
-                                }
-                        }
-                        cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){}); 
-                        return false;
-                }
-        });
-}
+
+    if(preferences['use_alert_filter_criteria'] == "1")
+    {
+        $.each(fromRules, function(index, value) {
+            if(value == folder){
+                for(var i=0; i < filters_c['criteria'].length; i++){
+                    if(filters_c['criteria'][i].field == 'from'){
+                        from = filters_c['criteria'][i].value;
+                    }
+                }
+                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){});
+                return false;
+            }
+        });
+    }
+}

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(){

trunk/prototype/modules/mail/templates/detailedfoldertree.ejs

@@ -5 +5 @@
                         Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 
                 };
-    specialFolders[outboxfolder] = {name: 'Caixa de Saída', classe:'outbox'};
+    specialFolders[outboxfolder] = {name: 'Caixa de Saï¿œda', classe:'outbox'};
         specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'};
         specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'};
@@ -67 +67 @@
 
           <%}%>
+        <% if(preferences['use_followupflags_and_labels'] == "1"){%>
           <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span>
+          <%}%>
           </li>
         </ul>