Changeset 5548 for trunk/prototype/modules/mail/js/followupflag.js

Timestamp:

02/24/12 15:37:35 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Resolvida logica para sinalizar/marcar e exibir sinalizadores e marcadores na busca de mensagens.

File:

• trunk/prototype/modules/mail/js/followupflag.js (modified) (5 diffs)

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

@@ -275 +275 @@
                 var alarmDate = false;
                 var doneDate  = false;
-                
+                var folder_name;
+                var folders = [];
+                var messages = [];
                 for (var i=0; i < selectedMessageIds.length; i++ ){
+                        if (currentTab == 0) {
+                                folder_name = current_folder;
+                        }else{
+                                var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+                                var tr = Element(selectedMessageIds[i]+'_s'+id_border);
+                                folder_name = tr.getAttribute('name');
+                        }
                         var messageNumber   = selectedMessageIds[i];
+                        folders.push(folder_name);
+                        
                         //var followupflag = DataLayer.get('followupflag', followupflagId.toString()),
                         var idFollowupflagged = winElement.find('.id-followup').val();
@@ -283 +294 @@
                                 uid : User.me.id,
                                 followupflagId : followupflagId, 
-                                folderName : current_folder, 
+                                folderName : folder_name, 
                                 messageNumber : messageNumber, 
                                 //alarmDeadline : winElement.find('[name="alarmDate"]').datepicker("getDate"), 
@@ -313 +324 @@
                         
                         $('#td_message_followup_' + messageNumber + ', ' + 
-                          '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor);
-                          
+                          '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 
                         DataLayer.put('followupflagged', followupflagged);
                 }
@@ -322 +332 @@
                         winElement.find('.id-followup').val(id);
                 });             
-                
-                //onceOpenedHeadersMessages[current_folder][followupflagged.messageNumber]['followupflagged']['followupflag'] = {};
                 var extend = DataLayer.get('followupflagged', {
-                filter: ['AND', ['IN', 'messageNumber', selectedMessageIds], ['=', 'folderName', current_folder]],criteria: {deepness: 1}});
+                filter: ['AND', ['IN', 'messageNumber', selectedMessageIds], ['IN', 'folderName', folders]],criteria: {deepness: 1}});
                 if(extend != "" || extend != 'undefined' || extend != []){
                         for(var ex = 0; ex < extend.length; ex++){
-                                onceOpenedHeadersMessages[current_folder][extend[ex].messageNumber]['followupflagged'] = {};
-                                DataLayer.merge(onceOpenedHeadersMessages[current_folder][extend[ex].messageNumber]['followupflagged'], extend[ex]);
+                                if(onceOpenedHeadersMessages[extend[ex].folderName]){
+                                        if(onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]){
+                                                onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]['followupflagged'] = {};
+                                                DataLayer.merge(onceOpenedHeadersMessages[extend[ex].folderName][extend[ex].messageNumber]['followupflagged'], extend[ex]);
+                                        }
+                                }
+
                         }
                 } else {
@@ -338 +351 @@
         .filter('.menu-configure-followupflag .delete').click(function(){
                 for(i = 0; i < selectedMessageIds.length; i++){
+                        var folder_name;
+                        if (currentTab == 0) {
+                                folder_name = current_folder;
+                        }else{
+                                var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+                                var tr = Element(selectedMessageIds[i]+'_s'+id_border);
+                                folder_name = tr.getAttribute('name');
+                        }
                         var messageNumber   = selectedMessageIds[i];
-                        var flag_id = onceOpenedHeadersMessages[current_folder][messageNumber]['followupflagged'].id;
-                        var flagged = $('#td_message_followup_' + messageNumber + ', ' + '#td_message_followup_search_' + messageNumber).find(".flag-edited");
-                        DataLayer.remove('followupflagged', flag_id);
-                        flagged.css("background", '#cccccc');
-                        flagged.find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                        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");
+                        }
                 }
                 DataLayer.commit();