Changeset 5625 for trunk/prototype/modules

Timestamp:

03/05/12 11:38:00 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Implementada opção de criar novo marcador ao clicar na msg e marca-la.

Location:

trunk/prototype/modules/mail

Files:

• interceptors/Helpers.php (modified) (1 diff)
• js/followupflag.js (modified) (3 diffs)
• js/label.js (modified) (7 diffs)

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -164 +164 @@
                 $imap_uri = $uri;
                 $imap_uri['service'] = 'Imap';
-                $imap_result = Controller::find($imap_uri, $params, $criteria);
+                $imap_result = Controller::find($imap_uri, $result, $criteria);
                 
                 /**

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

@@ +1 @@
+function updateCacheFollowupflag(msgNumber, msgFolder, op){
+        if(op){
+                if(typeof msgNumber == 'object'){
+                        var extend = DataLayer.get('followupflagged', {
+                                filter: ['AND', ['IN', 'messageNumber', msgNumber], ['IN', 'folderName', msgFolder]],
+                                criteria: {deepness: 1}
+                        }, true);
+                } else{
+                        var extend = DataLayer.get('followupflagged', {
+                                filter: ['AND', ['=', 'messageNumber', msgNumber], ['=', 'folderName', msgFolder]],
+                                criteria: {deepness: 1}
+                        }, true);
+                }
+
+                
+                if(extend != "" || extend != 'undefined' || extend != []){
+                        for(var i = 0; i < extend.length; i++){
+                                if(onceOpenedHeadersMessages[extend[i].folderName]){
+                                        if(onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]){
+                                                onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]['followupflagged'] = {};
+                                                DataLayer.merge(onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]['followupflagged'], extend[i]);
+                                        }
+                                }
+
+                        }
+                }
+        }else{
+                onceOpenedHeadersMessages[msgFolder][msgNumber]['followupflagged'] = undefined; 
+        }
+}
+
+
+
 function init_followup(data){
 
@@ -219 +252 @@
                         winElement.find('.menu-configure-followupflag .save').button("option", "disabled", true);
                         winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false);
+                        updateCacheFollowupflag(selectedMessageIds, folders, true);
                 });
-                
-                var extend = DataLayer.get('followupflagged', {
-                        filter: ['AND', ['IN', 'messageNumber', selectedMessageIds], ['IN', 'folderName', folders]],
-                        criteria: {deepness: 1}
-                });
-                
-                if(extend != "" || extend != 'undefined' || extend != []){
-                        for(var i = 0; i < extend.length; i++){
-                                if(onceOpenedHeadersMessages[extend[i].folderName]){
-                                        if(onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]){
-                                                onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]['followupflagged'] = {};
-                                                DataLayer.merge(onceOpenedHeadersMessages[extend[i].folderName][extend[i].messageNumber]['followupflagged'], extend[i]);
-                                        }
-                                }
-
-                        }
-                } else {
-                        alert('erro ao salvar');
-                }
         }).end()
         
         .filter('.menu-configure-followupflag .delete').click(function(){
                 if (selectedMessageIds.length == 0) $(this).button("option", "disabled", true);
-                
+                        /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */
+                        DataLayer.remove('followupflagged', false);
+                        DataLayer.get('followupflagged');
                         var roles = get_selected_messages_search_role().split(',');
                         for (var i=0; i < selectedMessageIds.length; i++ ){
@@ -270 +287 @@
                                                         .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                                         }
-
-                                        onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'] = undefined;
+                                        updateCacheFollowupflag(messageNumber, folder_name, false);
                                 }
                         }

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

@@ -32 +32 @@
                         $(span).html($(".label-list").find(".edit-value-list").val())
                         .parent().find('.edit').removeClass("hidden").parents("li").click(configureLabel).trigger("click");
-                        save_editLabel(nameLabel);
+                        save_editLabel(nameLabel, applyToSelectedMessages);
                         
                 }else if( event.keyCode == 27){
@@ -89 +89 @@
 }               
         
-function save_editLabel(nameLabel){     
+function save_editLabel(nameLabel, apply){      
         
         var lengthSpace = $.trim(nameLabel);
@@ -152 +152 @@
                 } else {
                         var nameLabel = winElement.find(".input-nome").val();
-                        new_label(nameLabel, false);                            
+                        new_label(nameLabel, false, apply);                             
                         winElement.find(".insert-label").val("");
                         $.Watermark.ShowAll();                          
@@ -208 +208 @@
 }
 
-function new_label(nameLabel, isNew){
+function new_label(nameLabel, isNew, apply){
         var labelCreated = {
                 uid: User.me.id,
@@ -232 +232 @@
                         borderColor : !!isNew ? '#000000' : winElement.find("input[name='borderColor']").val()
                 };
-
+                
+                /** Marca as mensagens selecionadas com o marcador criado*/
+                if(apply){
+                        labeledMessages(newLabel.id)
+                }
+                
                 $(".label-list-container ul").find(".empty-item").css("display","none");
                 $(".label-list-container ul")
@@ -382 +387 @@
                 
                 if(lengthSpace.length >= 4){
-                        new_label(nameLabel, true);
+                        new_label(nameLabel, true, data.applyToSelectedMessages);
                         $.Watermark.ShowAll();
                         winElement.find(".insert-label").val("");
@@ -413 +418 @@
         winElement.find(".buttons .save-label").click(function(){
                 var nameLabel = winElement.find(".input-nome").val();
-                save_editLabel(nameLabel);
+                save_editLabel(nameLabel, data.applyToSelectedMessages);
         });     
         //desfazer marcador