Changeset 5882
- Timestamp:
- 04/04/12 17:24:33 (12 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/draw_api.js
r5867 r5882 1655 1655 var messageClickedId = $(this).attr('id').match(/td_message_followup_([\d]+)/)[1]; 1656 1656 1657 var followupColor = $('#td_message_followup_' + messageClickedId).find(".flag-edited").css('backgroundColor'); 1658 1657 1659 $('#td_message_followup_' + messageClickedId + ', ' + 1658 1660 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") … … 1661 1663 $('#td_message_followup_' + messageClickedId + ', ' + 1662 1664 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent"); 1665 1666 1663 1667 /** 1664 1668 * Hack: … … 1722 1726 1723 1727 } else { 1728 $('#td_message_followup_' + messageClickedId + ', ' + 1729 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 1730 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 1731 $('#td_message_followup_' + messageClickedId + ', ' + 1732 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", followupColor); 1724 1733 $(tr_element).addClass('selected_msg').find(':checkbox').trigger('click'); 1725 1734 configureFollowupflag(); -
trunk/expressoMail1_2/js/search.js
r5867 r5882 541 541 $(td).click(function(event, ui){ 542 542 var messageClickedId = $(this).attr('id').match(/td_message_followup_search_([\d]+)/)[1]; 543 if(current_folder == mailbox){ 544 $('#td_message_followup_' + messageClickedId + ', ' + 545 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 546 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-4px; width:13px; height:13px;" src="../prototype/modules/mail/img/ajax-loader.gif" />'); 543 544 var followupColor = $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css('backgroundColor'); 545 546 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 547 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-4px; width:13px; height:13px;" src="../prototype/modules/mail/img/ajax-loader.gif" />'); 547 548 548 $('#td_message_followup_' + messageClickedId + ', ' + 549 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent"); 550 }else{ 551 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 552 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-4px; width:13px; height:13px;" src="../prototype/modules/mail/img/ajax-loader.gif" />'); 553 554 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent"); 555 } 549 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent"); 550 556 551 /**TODO Alterar após melhorias no filtro da camada javascript*/ 557 552 DataLayer.remove('followupflagged', false); … … 578 573 aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged); 579 574 DataLayer.commit(false, false, function(){ 575 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 576 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 577 580 578 if(current_folder == mailbox){ 581 579 $('#td_message_followup_' + messageClickedId + ', ' + 582 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")583 .html('<img src="../prototype/modules/mail/img/flagEditor.png">');584 585 $('#td_message_followup_' + messageClickedId + ', ' +586 580 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 587 }else{ 588 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 589 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 590 581 }else{ 591 582 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 592 583 } … … 607 598 DataLayer.remove('followupflagged', flagged[0].id ); 608 599 DataLayer.commit(false, false, function(){ 600 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 601 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 609 602 if(current_folder == mailbox){ 610 603 updateCacheFollowupflag(messageClickedId, mailbox, false); 611 $('#td_message_followup_' + messageClickedId + ', ' + 612 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 613 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 614 604 615 605 $('#td_message_followup_' + messageClickedId + ', ' + 616 606 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC').attr('title', '');; … … 621 611 }else{ 622 612 updateCacheFollowupflag(messageClickedId, mailbox, false); 623 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")624 .html('<img src="../prototype/modules/mail/img/flagEditor.png">');625 613 626 614 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC').attr('title', '');; … … 632 620 633 621 } else { 622 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 623 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 624 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", followupColor); 634 625 $(this).parents('[role="'+messageClickedId+'_'+mailbox+'"]').attr('class', 'selected_msg').find(':checkbox').trigger('click'); 635 626 configureFollowupflag();
Note: See TracChangeset
for help on using the changeset viewer.