Changeset 5861
- Timestamp:
- 04/02/12 16:14:14 (12 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5853 r5861 4833 4833 4834 4834 $params['search'] = mb_convert_encoding($params['search'], 'UTF-8',mb_detect_encoding($params['search'].'x', 'UTF-8, ISO-8859-1')); 4835 4835 4836 4836 $i = 0; 4837 4837 if(!isset($params['page'])) $params['page'] = 0; -
trunk/expressoMail1_2/js/draw_api.js
r5856 r5861 1654 1654 1655 1655 var messageClickedId = $(this).attr('id').match(/td_message_followup_([\d]+)/)[1]; 1656 1657 $('#td_message_followup_' + messageClickedId + ', ' + 1658 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 1659 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-3px; width:12px; height:12px;" src="../prototype/modules/mail/img/loader.gif" />'); 1656 1660 /** 1657 1661 * Hack: … … 1682 1686 followupflag: DataLayer.get('followupflag', '1') 1683 1687 }; 1684 $('#td_message_followup_' + messageClickedId + ', ' +1685 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor).attr('title', get_lang('Follow up'));1686 1688 headers_msgs.followupflagged.id = DataLayer.put('followupflagged', headers_msgs.followupflagged); 1687 1689 DataLayer.commit(false, false, function(){ 1690 $('#td_message_followup_' + messageClickedId + ', ' + 1691 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 1692 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 1693 1694 $('#td_message_followup_' + messageClickedId + ', ' + 1695 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 1688 1696 updateCacheFollowupflag(messageClickedId, msg_folder, true); 1689 1697 }); … … 1696 1704 $(this).find(".flag-edited").css("background", "#cccccc"); 1697 1705 DataLayer.remove('followupflagged', flagged[0].id ); 1698 // var data = {};1699 // data[ 'followupflagged://' + msg_folder + '/' + messageClickedId + '#' + flagged[0].id ] = false;1700 // DataLayer.dispatch('Sync', data, false, true);1701 1706 DataLayer.commit(false, false, function(){ 1702 1707 updateCacheFollowupflag(messageClickedId, msg_folder, false); 1703 1708 $('#td_message_followup_' + messageClickedId + ', ' + 1709 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 1710 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 1711 1712 $('#td_message_followup_' + messageClickedId + ', ' + 1704 1713 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC').attr('title', '');; 1714 1705 1715 $('#td_message_followup_' + messageClickedId + ', ' + 1706 1716 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") -
trunk/expressoMail1_2/js/search.js
r5847 r5861 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+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 546 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-3px; width:12px; height:12px;" src="../prototype/modules/mail/img/loader.gif" />'); 547 }else{ 548 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 549 .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-3px; width:12px; height:12px;" src="../prototype/modules/mail/img/loader.gif" />'); 550 } 543 551 /**TODO Alterar após melhorias no filtro da camada javascript*/ 544 552 DataLayer.remove('followupflagged', false); … … 562 570 followupflag: DataLayer.get('followupflag', '1') 563 571 }; 564 if(current_folder == mailbox){ 565 $('#td_message_followup_' + messageClickedId + ', ' + 566 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 567 }else{ 568 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 569 } 572 570 573 aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged); 571 574 DataLayer.commit(false, false, function(){ 575 if(current_folder == mailbox){ 576 $('#td_message_followup_' + messageClickedId + ', ' + 577 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 578 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 579 580 $('#td_message_followup_' + messageClickedId + ', ' + 581 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 582 }else{ 583 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 584 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 585 586 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor).attr('title', get_lang('Follow up')); 587 } 572 588 var extend = DataLayer.get('followupflagged', { 573 589 filter: ['AND', ['IN', 'messageNumber', messageClickedId], ['IN', 'folderName', mailbox]], … … 584 600 */ 585 601 $(this).find(".flag-edited").css("background", "#cccccc"); 586 // var data = {};587 // data[ 'followupflagged://' + mailbox + '/' + messageClickedId + '#' + flagged[0].id ] = false;588 // DataLayer.dispatch('Sync', data, false, true);589 602 DataLayer.remove('followupflagged', flagged[0].id ); 590 if(current_folder == mailbox){591 DataLayer.commit(false, false, function(){603 DataLayer.commit(false, false, function(){ 604 if(current_folder == mailbox){ 592 605 updateCacheFollowupflag(messageClickedId, mailbox, false); 593 606 $('#td_message_followup_' + messageClickedId + ', ' + 607 'tr[role="'+messageClickedId+'_'+msg_folder+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 608 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 609 610 $('#td_message_followup_' + messageClickedId + ', ' + 594 611 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC').attr('title', '');; 612 595 613 $('#td_message_followup_' + messageClickedId + ', ' + 596 614 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 597 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 598 }); 599 600 }else{ 601 DataLayer.commit(false, false, function(){ 615 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 616 }else{ 602 617 updateCacheFollowupflag(messageClickedId, mailbox, false); 618 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 619 .html('<img src="../prototype/modules/mail/img/flagEditor.png">'); 620 603 621 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC').attr('title', '');; 622 604 623 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited") 605 624 .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 606 } );607 } 625 } 626 }); 608 627 609 628 } else {
Note: See TracChangeset
for help on using the changeset viewer.