Changeset 3716 for branches/2.2
- Timestamp:
- 01/21/11 15:17:09 (14 years ago)
- Location:
- branches/2.2/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/draw_api.js
r3712 r3716 1372 1372 option_mark_as_unseen.className = "message_options"; 1373 1373 option_mark_as_unseen.onclick = function () { changeLinkState(this,'seen'); 1374 set_messages_flag('unseen',folder_id);1374 proxy_mensagens.proxy_set_message_flag(folder_id,'unseen'); 1375 1375 write_msg(get_lang('Message marked as ')+get_lang("Unseen")); 1376 1376 }; … … 1387 1387 if (info_msg.Flagged == "F"){ 1388 1388 option_mark_important.onclick = function() { changeLinkState(this,'important'); 1389 set_messages_flag('unflagged',folder_id);1389 proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged'); 1390 1390 write_msg(get_lang('Message marked as ')+get_lang("Normal")); 1391 1391 }; … … 1394 1394 else{ 1395 1395 option_mark_important.onclick = function() { changeLinkState(this,'normal'); 1396 set_messages_flag('flagged',folder_id);1396 proxy_mensagens.proxy_set_message_flag(folder_id,'flagged'); 1397 1397 write_msg(get_lang('Message marked as ')+get_lang("Important")); 1398 1398 }; … … 2110 2110 case 'important': 2111 2111 { 2112 el.onclick = function(){changeLinkState(el,'normal'); set_messages_flag('unflagged',currentTab.substr(0,currentTab.indexOf("_r"))); write_msg(get_lang('Message marked as ')+get_lang("Normal"))}2112 el.onclick = function(){changeLinkState(el,'normal');proxy_mensagens.proxy_set_message_flag(currentTab.substr(0,currentTab.indexOf("_r")),'flagged'); write_msg(get_lang('Message marked as ')+get_lang("Important"))} 2113 2113 break; 2114 2114 } 2115 2115 case 'normal': 2116 2116 { 2117 el.onclick = function(){ changeLinkState(el,'important'); set_messages_flag('flagged',currentTab.substr(0,currentTab.indexOf("_r")));write_msg(get_lang('Message marked as ')+get_lang("Important"))}2117 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"))} 2118 2118 break; 2119 2119 } 2120 2120 case 'unseen': 2121 2121 { 2122 el.onclick = function(){ changeLinkState(el,'seen'); set_messages_flag('unseen',currentTab.substr(0,currentTab.indexOf("_r")));write_msg(get_lang('Message marked as ')+get_lang("unseen"))}2122 el.onclick = function(){ changeLinkState(el,'seen');proxy_mensagens.proxy_set_message_flag(currentTab.substr(0,currentTab.indexOf("_r")),'unseen');write_msg(get_lang('Message marked as ')+get_lang("unseen"))} 2123 2123 break; 2124 2124 … … 2126 2126 case 'seen': 2127 2127 { 2128 el.onclick = function(){ changeLinkState(el,'unseen'); set_messages_flag('seen',currentTab.substr(0,currentTab.indexOf("_r")));write_msg(get_lang('Message marked as ')+get_lang("seen"))}2128 el.onclick = function(){ changeLinkState(el,'unseen');proxy_mensagens.proxy_set_message_flag(currentTab.substr(0,currentTab.indexOf("_r")),'seen');write_msg(get_lang('Message marked as ')+get_lang("seen"))} 2129 2129 break; 2130 2130 -
branches/2.2/expressoMail1_2/js/local_messages.js
r3572 r3716 647 647 } 648 648 649 var rs = this.dbGears.execute("select header,unseen from mail where rowid=" + msgs_to_set[i]);649 var rs = this.dbGears.execute("select header,unseen,mail from mail where rowid=" + msgs_to_set[i]); 650 650 header = connector.unserialize(rs.field(0)); 651 var mail = connector.unserialize(rs.field(2)); 651 652 unseen = rs.field(1); 652 653 switch(flag) { 653 654 case "unseen": 654 set_msg_as_unread(msgs_to_set[i]); 655 header["Unseen"] = "U"; 656 unseen = 1; 657 break; 655 set_msg_as_unread(msgs_to_set[i]); 656 header["Unseen"] = "U"; 657 mail["Unseen"] = "U"; 658 mail["header"]["Unseen"] = "U"; 659 unseen = 1; 660 break; 658 661 case "flagged": 659 set_msg_as_flagged(msgs_to_set[i]); 660 header["Flagged"] = "F"; 661 break; 662 set_msg_as_flagged(msgs_to_set[i]); 663 header["Flagged"] = "F"; 664 mail["Flagged"] = "F"; 665 mail["header"]["Flagged"] = "F"; 666 break; 662 667 case "unflagged": 663 if (header["Importance"].indexOf("High") != -1) 664 write_msg(get_lang("At least one of selected message cant be marked as normal")); 665 else { 666 set_msg_as_unflagged(msgs_to_set[i]); 667 header["Flagged"] = "N"; 668 } 668 if (header["Importance"].indexOf("High") != -1) 669 write_msg(get_lang("At least one of selected message cant be marked as normal")); 670 else { 671 set_msg_as_unflagged(msgs_to_set[i]); 672 header["Flagged"] = "N"; 673 mail["Flagged"] = "N"; 674 mail["header"]["Flagged"] = "N"; 675 } 669 676 break; 670 677 case "seen": 671 header["Unseen"] = "N"; 672 set_msg_as_read(msgs_to_set[i],true); 673 unseen = 0; 674 break; 678 header["Unseen"] = "N"; 679 mail["Unseen"] = "N"; 680 mail["header"]["Unseen"] = "N"; 681 set_msg_as_read(msgs_to_set[i],true); 682 unseen = 0; 683 break; 675 684 case "answered": 676 header["Draft"]=""; 677 header["Answered"]="A"; 678 Element("td_message_answered_"+msgs_to_set[i]).innerHTML = '<img src=templates/default/images/answered.gif title=Respondida>'; 685 header["Draft"]=""; 686 mail["Draft"] = ""; 687 mail["header"]["Draft"] = ""; 688 header["Answered"]="A"; 689 mail["Answered"] = "A"; 690 mail["header"]["Answered"] = "A"; 691 Element("td_message_answered_"+msgs_to_set[i]).innerHTML = '<img src=templates/default/images/answered.gif title=Respondida>'; 679 692 break; 680 693 case "forwarded": 681 header["Draft"]="X"; 682 header["Answered"]="A"; 683 Element("td_message_answered_"+msgs_to_set[i]).innerHTML = '<img src=templates/default/images/forwarded.gif title=Encaminhada>'; 684 break; 694 header["Draft"]="X"; 695 mail["Draft"] = "X"; 696 mail["header"]["Draft"] = "X"; 697 header["Answered"]="A"; 698 mail["Answered"] = "A"; 699 mail["header"]["Answered"] = "A"; 700 Element("td_message_answered_"+msgs_to_set[i]).innerHTML = '<img src=templates/default/images/forwarded.gif title=Encaminhada>'; 701 break; 685 702 } 686 703 … … 690 707 Element("check_box_message_" + msgs_to_set[i]).checked = false; 691 708 692 this.dbGears.execute("update mail set header='"+connector.serialize(header)+"',unseen="+unseen+" where rowid="+msgs_to_set[i]); 709 this.dbGears.execute("update mail set mail='"+connector.serialize(mail)+"',header='"+connector.serialize(header)+ 710 "',unseen="+unseen+" where rowid="+msgs_to_set[i]); 693 711 } 694 712 if(Element('chk_box_select_all_messages')) -
branches/2.2/expressoMail1_2/js/main.js
r3693 r3716 2067 2067 return; 2068 2068 if (data.status && Element("td_message_answered_"+msg_number)) { 2069 if(flag == 'answered') 2070 Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/answered.gif title=Respondida>'; 2071 else if(flag == 'forwarded') 2072 Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/forwarded.gif title=Encaminhada>'; 2069 2070 switch(flag){ 2071 case "unseen": 2072 set_msg_as_unread(msg_number); 2073 break; 2074 case "seen": 2075 set_msg_as_read(msg_number); 2076 break; 2077 case "flagged": 2078 set_msg_as_flagged(msg_number); 2079 break; 2080 case "unflagged": 2081 set_msg_as_unflagged(msg_number); 2082 break; 2083 case "answered": 2084 Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/answered.gif title=Respondida>'; 2085 break; 2086 case "forwarded": 2087 Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/forwarded.gif title=Encaminhada>'; 2088 break; 2089 } 2073 2090 } 2074 2091 }
Note: See TracChangeset
for help on using the changeset viewer.