Index: /trunk/prototype/modules/mail/js/followupflag.js =================================================================== --- /trunk/prototype/modules/mail/js/followupflag.js (revision 5577) +++ /trunk/prototype/modules/mail/js/followupflag.js (revision 5584) @@ -186,5 +186,9 @@ * Aplica o ícone correspondente na lista de mensagens do expressoMail */ - var flagged = $('#td_message_followup_' + messageNumber + ', ' + '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited"); + if(current_folder == folder_name){ + var flagged = $('#td_message_followup_' + messageNumber + ', tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); + } else{ + var flagged = $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); + } if(isDone){ flagged.find("img").attr("src", "../prototype/modules/mail/img/flagChecked.png").css("margin-left","-3px"); @@ -193,7 +197,11 @@ } - $('#td_message_followup_' + messageNumber + ', ' + - '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited").css("background", backgroundColor); - + + if(current_folder == folder_name){ + $('#td_message_followup_' + messageNumber + ', ' + + 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); + }else{ + $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); + } /** * Salva ou, caso já exista, atualiza @@ -247,9 +255,15 @@ var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id; DataLayer.remove('followupflagged', flag_id); - $('#td_message_followup_' + messageNumber + ', ' + - '#td_message_followup_search_' + messageNumber+':first').find(".flag-edited").css("background", '#CCC'); - $('#td_message_followup_' + messageNumber + ', ' + - '#td_message_followup_search_' + messageNumber + 'first').find(".flag-edited") - .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); + if(current_folder == folder_name){ + $('#td_message_followup_' + messageNumber + ', ' + + 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC'); + $('#td_message_followup_' + messageNumber + ', ' + + 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited") + .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); + }else{ + $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", '#CCC'); + $('tr[role="'+messageNumber+'_'+folder_name+'"] #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; Index: /trunk/expressoMail1_2/js/main.js =================================================================== --- /trunk/expressoMail1_2/js/main.js (revision 5575) +++ /trunk/expressoMail1_2/js/main.js (revision 5584) @@ -1309,4 +1309,25 @@ } +function get_selected_messages_search_role(){ + var aba = document.getElementById('content_id_'+currentTab); + var selected_messages = ""; + jQuery(function() { + jQuery("#"+aba.id+" tr").each(function(i, main_list) { + var check_box = main_list.firstChild.firstChild; + if(check_box && check_box.checked) { + selected_messages += main_list.role + ',' ; + }; + }); + + }); + if (selected_messages != ""){ + if(selected_messages.indexOf(',') == 0) + selected_messages = selected_messages.substring(1,(selected_messages.length)); + selected_messages = selected_messages.substring(0,(selected_messages.length-1)); + return selected_messages; + }else{ + return false; + } +} function get_selected_messages(){ Index: /trunk/expressoMail1_2/js/search.js =================================================================== --- /trunk/expressoMail1_2/js/search.js (revision 5580) +++ /trunk/expressoMail1_2/js/search.js (revision 5584) @@ -468,4 +468,8 @@ tr.name = mailbox; + // set attribute role id_folder + tr.setAttribute('role', uid_msg+'_'+mailbox); + tr.role = uid_msg+'_'+mailbox; + if ( aux.flag.match("U") ) add_className(tr,'tr_msg_unread'); @@ -555,6 +559,10 @@ followupflag: DataLayer.get('followupflag', '1') }; - $('#td_message_followup_' + messageClickedId + ', ' + - '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited").css("background", aux.followupflagged.backgroundColor); + if(current_folder == mailbox){ + $('#td_message_followup_' + messageClickedId + ', ' + + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor); + }else{ + $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor); + } aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged); @@ -567,9 +575,15 @@ DataLayer.remove('followupflagged', flagged[0].id); - $('#td_message_followup_' + messageClickedId + ', ' + - '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited").css("background", '#CCC'); - $('#td_message_followup_' + messageClickedId + ', ' + - '#td_message_followup_search_' + messageClickedId+':first').find(".flag-edited") - .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); + if(current_folder == mailbox){ + $('#td_message_followup_' + messageClickedId + ', ' + + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC'); + $('#td_message_followup_' + messageClickedId + ', ' + + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") + .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); + }else{ + $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC'); + $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") + .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); + } } else { //TODO - open dialog Index: /trunk/expressoMail1_2/js/draw_api.js =================================================================== --- /trunk/expressoMail1_2/js/draw_api.js (revision 5576) +++ /trunk/expressoMail1_2/js/draw_api.js (revision 5584) @@ -219,6 +219,6 @@ } } - /* - tree_folders.draw(Element('content_folders')); + + /*tree_folders.draw(Element('content_folders')); if (!expresso_offline) { n_root.changeState(); @@ -228,6 +228,6 @@ root_local.changeState(); tree_folders.getNodeById('local_Inbox')._select(); - } - */ + }*/ + var trash_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Trash"]]) + 'tree_folders'); var draft_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Drafts"]]) + 'tree_folders'); @@ -346,5 +346,5 @@ myLabels.html("