Changeset 3806 for branches/2.2/expressoMail1_2
- Timestamp:
- 02/23/11 15:03:49 (14 years ago)
- Location:
- branches/2.2/expressoMail1_2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/draw_api.js
r3798 r3806 1386 1386 1387 1387 if (info_msg.Flagged == "F"){ 1388 option_mark_important.onclick = function() { changeLinkState(this,'important'); 1389 proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged'); 1390 write_msg(get_lang('Message marked as ')+get_lang("Normal")); 1388 option_mark_important.onclick = function() { 1389 var _this = this; 1390 proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged', function(success){ 1391 if (success) { 1392 changeLinkState(_this, 'important'); 1393 write_msg(get_lang('Message marked as ') + get_lang("Normal")); 1394 } 1395 } ); 1396 1391 1397 }; 1392 1398 option_mark_important.innerHTML = get_lang("Normal"); … … 2126 2132 case 'normal': 2127 2133 { 2128 el.onclick = function(){ changeLinkState(el,'important');proxy_mensagens.proxy_set_message_flag(currentTab.substr(0,currentTab.indexOf("_r")),'unflagged');write_msg(get_lang('Message marked as ')+get_lang("Normal"))} 2134 el.onclick = function(){ 2135 var _this = this; 2136 proxy_mensagens.proxy_set_message_flag(currentTab.substr(0,currentTab.indexOf("_r")),'unflagged', function(success){ 2137 if (success) { 2138 changeLinkState(_this, 'important'); 2139 write_msg(get_lang('Message marked as ') + get_lang("Normal")); 2140 } 2141 } ); 2142 } 2129 2143 break; 2130 2144 } -
branches/2.2/expressoMail1_2/js/local_messages.js
r3788 r3806 631 631 local_messages.prototype.set_messages_flag = function(msgs_number, flag) { 632 632 this.init_local_messages(); 633 var no_errors = true; 633 634 var msgs_to_set; 635 var one_message = false; 634 636 if (msgs_number == 'get_selected_messages') { 635 var msgs_to_set = get_selected_messages();636 msgs_to_set= msgs_to_set.split(",");637 var msgs_to_set = get_selected_messages(); 638 msgs_to_set= msgs_to_set.split(","); 637 639 } 638 640 else { //Just one message 639 msgs_to_set = new Array(); 640 msgs_to_set[0] = msgs_number; 641 one_message = true; 642 msgs_to_set = new Array(); 643 msgs_to_set[0] = msgs_number; 641 644 } 642 645 for (var i in msgs_to_set) { … … 666 669 break; 667 670 case "unflagged": 668 if (header["Importance"].indexOf("High") != -1) 669 write_msg(get_lang("At least one of selected message cant be marked as normal"));671 if (header["Importance"].indexOf("High") != -1) 672 no_errors = false; 670 673 else { 671 674 set_msg_as_unflagged(msgs_to_set[i]); … … 713 716 Element('chk_box_select_all_messages').checked = false; 714 717 this.finalize(); 715 716 } 717 718 local_messages.prototype.set_message_flag = function(msg_number,flag) { 719 this.set_messages_flag(msg_number,flag); 718 if (!no_errors) { 719 if(one_message) 720 write_msg(get_lang("this message cant be marked as normal")); 721 else 722 write_msg(get_lang("At least one of selected message cant be marked as normal")); 723 return false; 724 } 725 return true; 726 727 } 728 729 local_messages.prototype.set_message_flag = function(msg_number,flag,func_after_flag_change) { 730 no_errors = this.set_messages_flag(msg_number,flag); 731 if(no_errors && func_after_flag_change) 732 func_after_flag_change(true); 720 733 } 721 734 -
branches/2.2/expressoMail1_2/js/main.js
r3798 r3806 2012 2012 2013 2013 if(!data.status) { 2014 alert(data.msg);2014 write_msg(data.msg); 2015 2015 Element('chk_box_select_all_messages').checked = false; 2016 2016 for (var i = 0; i < msgs_to_set.length; i++) { … … 2086 2086 2087 2087 // By message number 2088 function set_message_flag(msg_number, flag){ 2089 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); 2088 function set_message_flag(msg_number, flag, func_after_flag_change){ 2089 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas 2090 if(!msg_number_folder) 2091 var msg_number_folder = Element("input_folder_"+msg_number+"_r"); //Mensagens abertas 2092 2090 2093 var handler_set_messages_flag = function (data){ 2091 2094 if(!verify_session(data)) 2092 2095 return; 2096 if(!data.status) { 2097 write_msg(get_lang("this message cant be marked as normal")); 2098 return; 2099 } 2100 else if(func_after_flag_change) { 2101 func_after_flag_change(true); 2102 } 2093 2103 if (data.status && Element("td_message_answered_"+msg_number)) { 2094 2104 -
branches/2.2/expressoMail1_2/js/messages_controller.js
r3750 r3806 78 78 } 79 79 80 messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag){ 81 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); 82 var folder = msg_number_folder ? msg_number_folder.value : get_current_folder() 80 messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag,func_after_flag_change){ 81 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas 82 if(!msg_number_folder) 83 var msg_number_folder = Element("input_folder_"+msg_number+"_r"); //Mensagens abertas 84 var folder = msg_number_folder ? msg_number_folder.value : get_current_folder(); 83 85 if(this.is_local_folder(folder)) { 84 expresso_local_messages.set_message_flag(msg_number,flag );85 } 86 else { 87 set_message_flag(msg_number,flag );86 expresso_local_messages.set_message_flag(msg_number,flag, func_after_flag_change); 87 } 88 else { 89 set_message_flag(msg_number,flag, func_after_flag_change); 88 90 } 89 91 } -
branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang
r3805 r3806 38 38 At least one message have the same origin expressoMail1_2 pt-br Pelo menos uma das mensagens está sendo movida para a mesma pasta 39 39 at least, one of selected mails is already archived, expresso tried to archive the others, check them later expressoMail1_2 pt-br Pelo menos uma das mensagens selecionadas já foi arquivada anteriormente, o expresso tentou arquivar as outras, verifique-as mais tarde. 40 this message cant be marked as normal expressoMail1_2 pt-br Esta mensagem não pode ser marcada como normal 40 41 At least one of selected message cant be marked as normal expressoMail1_2 pt-br Pelo menos uma das mensagens selecionadas não pode ser marcada como normal 41 42 attachment expressoMail1_2 pt-br anexo
Note: See TracChangeset
for help on using the changeset viewer.