Changeset 5575 for trunk/prototype

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/prototype/modules/mail

Files:

• js/followupflag.js (modified) (3 diffs)
• templates/followupflag_configure.ejs (modified) (1 diff)

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

@@ -236 +236 @@
                         }
                         
-                        var flagged = $('#td_message_followup_' + messageNumber + ', ' + '#td_message_followup_search_' + messageNumber).find(".flag-edited");
+                        var flagged = $('#td_message_followup_' + messageNumber + ', ' + '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited");
                         if(isDone){
                                 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagChecked.png").css("margin-left","-3px");
@@ -244 +244 @@
                         
                         $('#td_message_followup_' + messageNumber + ', ' + 
-                          '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 
+                          '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited").css("background", backgroundColor); 
                         DataLayer.put('followupflagged', followupflagged);
                 }
@@ -286 +286 @@
                                         DataLayer.remove('followupflagged', flag_id);
                                         $('#td_message_followup_' + messageNumber + ', ' + 
-                                          '#td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC');
+                                          '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited").css("background", '#CCC');
                                         $('#td_message_followup_' + messageNumber + ', ' + 
-                                                '#td_message_followup_search_' + messageNumber).find(".flag-edited")
+                                                '#td_message_followup_search_' + messageNumber + 'first').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/templates/followupflag_configure.ejs

@@ -45 +45 @@
                 <legend><%= get_lang("Basic")%></legend>
                 <div class="followupflag-configure">
-                        <input type="hidden" class="id-followup" value="" name="followupFlag">
+                        <input type="hidden" class="id-followup" value="<%= (data.messages[0].followupflagged) ? data.messages[0].followupflagged.id : '' %>" name="followupFlag">
                         <label class="label-name"><%= get_lang("Flag as")%>:</label> 
                         <select name="name">