Changeset 5575 for trunk/expressoMail1_2

Timestamp:

02/28/12 10:42:57 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Contornado problema de ids duplicados na busca rápida para sinalizadores/marcadores.

Location:

trunk/expressoMail1_2/js

Files:

• doiMenuData.js (modified) (2 diffs)
• draw_api.js (modified) (6 diffs)
• main.js (modified) (1 diff)
• search.js (modified) (3 diffs)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -167 +167 @@
                 msg_number = messageInfo.uid;
         }
-        $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number)
+        $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first')
         .html('<img src="../prototype/modules/mail/img/tag.png">');
         
@@ -196 +196 @@
         }
 
-        $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number);
+        $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first');
 
         $.contextMenu({
-                selector: '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number,
+                selector: '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number + ':first',
                 trigger: 'hover',
                 delay:100,

trunk/expressoMail1_2/js/draw_api.js

@@ -220 +220 @@
                         }
 
-                /* tree_folders.draw(Element('content_folders'));
+                tree_folders.draw(Element('content_folders'));
                 if (!expresso_offline) {
                         n_root.changeState();
@@ -228 +228 @@
                         root_local.changeState();
                         tree_folders.getNodeById('local_Inbox')._select();
-                } */
+                }
                 
                 var trash_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Trash"]])  + 'tree_folders'); 
@@ -346 +346 @@
         myLabels.html("<div class='my-labels'>" +
                                 "<img src='../prototype/modules/mail/img/tag.png'/>" +
-                                "<a class='title-my-labels' tabindex='0' role='button' aria-expanded='false' title='"+get_lang("My Labels")+"'>"+get_lang("My Labels")+"</a>" +
+                                "<a class='title-my-labels' tabindex='0' role='button' aria-expanded='false' title='"+get_lang("My Label")+"'>"+get_lang("My Label")+"</a>" +
                                 
                                 "<span class='status-list-labels ui-icon ui-icon-triangle-1-s'></span>" +
@@ -355 +355 @@
                 var labelId = $(this).parents("li").attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
                 search_emails("UNDELETED KEYWORD \"$Label"+labelId+"\"");
-        }).end()
+        })
         .find(".square-color").css("display","").click(function(){
                 $(this).parent(".label-item").each(function(){
@@ -1691 +1691 @@
                                 };
                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor);
+                                '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor);
                                 //$(this).find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor);
                                 headers_msgs.followupflagged.id = DataLayer.put('followupflagged', headers_msgs.followupflagged);
@@ -1703 +1703 @@
                                 DataLayer.remove('followupflagged', flagged[0].id);
                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                  '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC');
+                                  '#td_message_followup_search_' + messageClickedId + ':first').find(".flag-edited").css("background", '#CCC');
                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                        '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                        '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited")
                                         .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                         } else {

trunk/expressoMail1_2/js/main.js

@@ -322 +322 @@
 
 function show_msg_img(msg_number,folder){
-alert(msg_number+folder);
         var call_back = function(data){
            data.showImg = true;

trunk/expressoMail1_2/js/search.js

@@ -556 +556 @@
                                                 };
                                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);                                         
+                                                '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited").css("background", aux.followupflagged.backgroundColor);                                                
                                                 aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged);
                                                 
@@ -568 +568 @@
                                                 DataLayer.remove('followupflagged', flagged[0].id);
                                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                  '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC');
+                                                  '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited").css("background", '#CCC');
                                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                        '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                        '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited")
                                                         .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                                         } else {
@@ -805 +805 @@
                 }
                 
+
+
         
                 var cont = parseInt(0);