Changeset 5548 for trunk/expressoMail1_2/js/doiMenuData.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/expressoMail1_2/js/doiMenuData.js (modified) (8 diffs)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -42 +42 @@
                                 }       
                                 var lableleds = new Array();
-                                
+                                var msg_folder = current_folder;
+                                var messages = [];
                                 if(currentTab == 0){
-                                        var messages = get_selected_messages().split(',');
+                                        var id = get_selected_messages().split(',');
+                                        for (i = 0; i < id.length; i++){
+                                                messages.push({
+                                                        "msg_number": id[i],
+                                                        "msg_folder": msg_folder,
+                                                });
+                                        }
                                 }else{
-                                        var messages = get_selected_messages_search().split(',');
+                                        var id = get_selected_messages_search().split(',');
+                                        var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+                                        for (i = 0; i < id.length; i++){
+                                                var tr = Element(id[i]+'_s'+id_border);
+                                                msg_folder = tr.getAttribute('name'); 
+                                                messages.push({
+                                                        "msg_number": id[i],
+                                                        "msg_folder": msg_folder,
+                                                });
+                                        }       
                                 }
 
@@ -53 +69 @@
                                                         'AND',
                                                         ['=', 'labelId', label.id], 
-                                                        ['=', 'folderName', current_folder], 
-                                                        ['=', 'messageNumber', messages[i]]
+                                                        ['=', 'folderName', messages[i].msg_folder], 
+                                                        ['=', 'messageNumber', messages[i].msg_number]
                                         ]);
                                         if (!hasLabel) {
@@ -60 +76 @@
                                                         DataLayer.put('labeled', {
                                                                 labelId:label.id, 
-                                                                folderName:current_folder, 
-                                                                messageNumber:messages[i]
+                                                                folderName:messages[i].msg_folder, 
+                                                                messageNumber:messages[i].msg_number
                                                         })
                                                 );
@@ -68 +84 @@
                                 }
                                 DataLayer.commit();
-                                for (var i=0; i < messages.length; i++) {
-                                        updateLabelsColumn({msg_number:messages[i], labels:false});
-                                }
+                                        for (var i=0; i < messages.length; i++) {
+                                                updateLabelsColumn({msg_number:messages[i].msg_number, boxname:messages[i].msg_folder, labels:false});
+                                        }
                         }
                 },
@@ -97 +113 @@
                 "i01": {"name": get_lang("Preferences"), "icon": "preferences-mail", callback: preferences_mail },
                 "i02": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
-                "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox2 },
+                "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox },
                 "i04": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox },
                 "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
@@ -144 +160 @@
 
 function updateLabelsColumn(messageInfo) {
-        $('#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number)
+        var msg_number = messageInfo.msg_number;
+        if(messageInfo.uid != '' && messageInfo.uid != 'undefined' && messageInfo.uid != null){
+                msg_number = messageInfo.uid;
+        }
+        $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number)
         .html('<img src="../prototype/modules/mail/img/tag.png">');
-
+        
+        var msg_folder = current_folder;
+        if(messageInfo.boxname != '' && messageInfo.boxname != 'undefined' && messageInfo.boxname != null){
+                msg_folder = messageInfo.boxname;
+        }
         var menuItems = {};
         if (messageInfo.labels) {
@@ -152 +176 @@
         } else {
                 var labeleds = DataLayer.get('labeled', {
+                        criteria: {deepness: '2',
                         filter: [
                                 'AND',
-                                ['=', 'folderName', current_folder], 
-                                ['=', 'messageNumber', messageInfo.msg_number]
-                        ],
-                        criteria: {deepness: 2}
+                                ['=', 'folderName', msg_folder], 
+                                ['=', 'messageNumber', msg_number]
+                        ]}
+                        
                 });
                 if (labeleds) {
@@ -168 +193 @@
         }
 
-        $.contextMenu( 'destroy', '#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number);
+        $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number);
 
         $.contextMenu({
-                selector: '#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number,
+                selector: '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number,
                 trigger: 'hover',
                 delay:100,