Changeset 5564 for trunk/prototype

Timestamp:

02/27/12 15:10:09 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Atualizar onceOpenedHeadersMessages ao excluir sinalizador. Corrigido salvar label.

Location:

trunk/prototype/modules/mail/js

Files:

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

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

@@ -362 +362 @@
                         var messageNumber   = selectedMessageIds[i];
                         if(onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged']){
-                                var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id;
-                                DataLayer.remove('followupflagged', flag_id);
-                                $('#td_message_followup_' + messageNumber + ', ' + 
-                                  '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC');
-                                $('#td_message_followup_' + messageNumber + ', ' + 
-                                        '#td_message_followup_search_' + messageNumber).find(".flag-edited")
-                                        .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                                if(onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id){
+                                        var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id;
+                                        DataLayer.remove('followupflagged', flag_id);
+                                        $('#td_message_followup_' + messageNumber + ', ' + 
+                                          '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC');
+                                        $('#td_message_followup_' + messageNumber + ', ' + 
+                                                '#td_message_followup_search_' + messageNumber).find(".flag-edited")
+                                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                                        onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'] = undefined;
+                                }
                         }
                 }

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

@@ -16 +16 @@
         winElement.find(".preview-label-inner").text($(this).text());
 }
+
+
 function editLabel(){   
         var conteudoSpan = $(this).parent().find(".text-list").text();
@@ -29 +31 @@
                         $(span).html($(".label-list").find(".edit-value-list").val())
                         .parent().find('.edit').removeClass("hidden").parents("li").click(configureLabel).trigger("click");
-                        winElement.find(".buttons .save-label").click(save_editLabel());        
-                        winElement.find(".buttons .save-label").trigger("click");
+                        save_editLabel();
                         
                 }else if( event.keyCode == 27){
@@ -46 +47 @@
         event.stopImmediatePropagation();
 }
+
+function colors_suggestions(){
+        return [
+                                {name:'Padrão', border:'#3366cc', font:'#ffffff', background:'#3366cc'},
+                                {name:'Coala', border:'#123456', font:'#ffffff', background:'#385c80'},
+                                {name:'Tomate', border:'#d5130b', font:'#111111', background:'#e36d76'},
+                                {name:'Limão', border:'#32ed21', font:'#1f3f1c', background:'#b2f1ac'},
+                                {name:'Alto contraste', border:'#000000', font:'#ffffff', background:'#222222'}
+                        ]               
+}
+function rgb2hex(rgb){
+ rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+ return "#" +
+  ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) +
+  ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) +
+  ("0" + parseInt(rgb[3],10).toString(16)).slice(-2);
+}
+
+function confirmDelete(id){
+        $.Zebra_Dialog('<strong>Deseja excluir esse marcador?</strong>', {
+                'type':     'question',
+                'title':    'Atenção',
+                'buttons': ['Sim','Não'],       
+                'onClose':  function(caption) {
+                        if(caption == 'Sim'){
+                                delete_label(id);
+                        }
+                }
+        });     
+}                       
 function save_editLabel(){
                 $(".save-label").button("disable");
@@ -139 +170 @@
 
 }
-function colors_suggestions(){
-        return [
-                                {name:'Padrão', border:'#3366cc', font:'#ffffff', background:'#3366cc'},
-                                {name:'Coala', border:'#123456', font:'#ffffff', background:'#385c80'},
-                                {name:'Tomate', border:'#d5130b', font:'#111111', background:'#e36d76'},
-                                {name:'Limão', border:'#32ed21', font:'#1f3f1c', background:'#b2f1ac'},
-                                {name:'Alto contraste', border:'#000000', font:'#ffffff', background:'#222222'}
-                        ]               
-}
-function rgb2hex(rgb){
- rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
- return "#" +
-  ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) +
-  ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) +
-  ("0" + parseInt(rgb[3],10).toString(16)).slice(-2);
-}
-
-function confirmDelete(id){
-        $.Zebra_Dialog('<strong>Deseja excluir esse marcador?</strong>', {
-                'type':     'question',
-                'title':    'Atenção',
-                'buttons': ['Sim','Não'],       
-                'onClose':  function(caption) {
-                        if(caption == 'Sim'){
-                                delete_label(id);
-                        }
-                }
-        });     
-}                       
 function delete_label(id){
         $(".label-list li").each(function () {
@@ -428 +430 @@
                 
         //salvar/criar marcador
-        winElement.find(".buttons .save-label").click(save_editLabel());        
+        winElement.find(".buttons .save-label").click(function(){
+                save_editLabel();
+        });     
         //desfazer marcador
         winElement.find(".buttons .undo-label").click(function(event){