- Timestamp:
- 09/26/12 19:03:11 (11 years ago)
- Location:
- sandbox/2.5.0-expresso1/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.0-expresso1/expressoMail1_2/js/draw_api.js
r7227 r7320 2680 2680 var option_mark_as_unseen = document.createElement("SPAN"); 2681 2681 option_mark_as_unseen.className = "reply_options"; 2682 option_mark_as_unseen.onclick = function () {changeLinkState(this,'seen'); 2683 proxy_mensagens.proxy_set_message_flag(folder_id,'unseen'); 2682 option_mark_as_unseen.onclick = function () {changeLinkState(this,'seen'); 2683 2684 //Marcosw inicio - mudança no parametro passado 2685 proxy_mensagens.proxy_set_message_flag(folder_id,'unseen',null,ID.split("_r_")[0]); 2686 //Marcosw fim 2687 2684 2688 write_msg(get_lang('Message marked as ')+get_lang("Unseen")); 2685 2689 }; … … 2696 2700 option_mark_important.onclick = function() { 2697 2701 var _this = this; 2698 proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged', function(success){ 2699 if (success) { 2700 2701 write_msg(get_lang('Message marked as ') + get_lang("Normal"));2702 } 2703 } ); 2702 2703 //Marcosw inicio - removido função anonima para evitar inconsistência 2704 changeLinkState(_this, 'important'); 2705 proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged',null,ID.split("_r_")[0]); 2706 write_msg(get_lang('Message marked as ')+get_lang("Normal")); 2707 //Marcosw fim 2704 2708 2705 2709 }; 2706 2710 option_mark_important.innerHTML = get_lang("Normal"); 2707 2711 } 2708 2712 else{ 2709 option_mark_important.onclick = function() {changeLinkState(this,'normal'); 2710 proxy_mensagens.proxy_set_message_flag(folder_id,'flagged'); 2713 option_mark_important.onclick = function() {changeLinkState(this,'normal',null,ID.substr(0, ID.length-2)); 2714 2715 //Marcosw inicio - mudança no parametro passado 2716 proxy_mensagens.proxy_set_message_flag(folder_id,'flagged',null,ID.split("_r_")[0]); 2717 //Marcosw fim 2718 2711 2719 write_msg(get_lang('Message marked as ')+get_lang("Important")); 2712 2720 }; -
sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js
r7296 r7320 608 608 609 609 } 610 //Change msg class to read. 610 611 //Marcosw inicio - Comentado código antigo gears 612 /* 611 613 if (!msg_is_read(ID)) 612 614 { … … 617 619 } 618 620 } 621 */ 622 //Marcosw fim 623 624 //Marcosw inicio - Inserido código novo MailArchiver 625 //Change msg class to read. 626 if (!msg_is_read(ID)) 627 { 628 //MAILARCHIVER-01 TAG MESSAGE AS SEEN 629 if (proxy_mensagens.is_local_folder(get_current_folder())){ 630 expresso_mail_archive.drawdata = null //no draw action 631 var tl = expresso_mail_archive.pattern.tagConfig('unseen', ID, 1); 632 expresso_mail_archive.taglist = tl; 633 expresso_mail_archive.progressbar = window.setTimeout("expresso_mail_archive.tagMessage()",1); 634 } 635 set_msg_as_read(ID, true); 636 if (msg_info.cacheHit || (!proxy_mensagens.is_local_folder(get_current_folder()) && msg_info.original_ID)) 637 { 638 set_message_flag(ID, "seen"); // avoid caducous (lazy) data 639 } 640 } 641 //Marcosw fim 619 642 } 620 643 setTimeout('resizeWindow()',300); -
sandbox/2.5.0-expresso1/expressoMail1_2/js/messages_controller.js
r7296 r7320 345 345 } 346 346 347 messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag,func_after_flag_change){ 348 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas 347 //Marcosw inicio - adicionado mais um parametro na função 348 messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag,func_after_flag_change,msgid){ 349 //Marcosw fim 350 var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas 349 351 if(!msg_number_folder) 350 352 var msg_number_folder = Element("input_folder_"+msg_number+"_r"); //Mensagens abertas 351 353 var folder = msg_number_folder ? msg_number_folder.value : get_current_folder(); 354 355 //Marcosw inicio - comentado código inconsistente do gears 356 /* 352 357 if(this.is_local_folder(folder)) { 353 358 expresso_local_messages.set_message_flag(msg_number,flag, func_after_flag_change); … … 356 361 set_message_flag(msg_number,flag, func_after_flag_change); 357 362 } 363 */ 364 //Marcosw fim 365 366 //Marcosw inicio - Adicionado código novo do MailArchiver 367 //MAILARCHIVER 368 if(this.is_local_folder(folder)) { 369 if(!msgid) 370 msgid = msg_number; 371 var taglist = flag; 372 var operation; 373 374 switch(flag.toLowerCase()){ 375 case 'unseen': 376 strtag = "unseen"; 377 operation = 0; 378 set_msg_as_unread(msgid); 379 break; 380 case 'seen': 381 strtag = "unseen"; 382 operation = 1; 383 set_msg_as_read(msgid); 384 break; 385 case 'flagged': 386 strtag = 'flagged, importance_high'; 387 operation = 0; 388 set_msg_as_flagged(msgid); 389 break; 390 case 'unflagged': 391 strtag = "flagged, importance_high"; 392 operation = 1; 393 set_msg_as_unflagged(msgid); 394 break; 395 case 'forwarded': 396 strtag = "forwarded"; 397 operation = 0; 398 set_msg_as_flagged(msgid); 399 case 'answered': 400 strtag = "answered"; 401 operation = 0; 402 set_msg_as_flagged(msgid); 403 404 } 405 406 expresso_mail_archive.drawdata = null; 407 var tl = expresso_mail_archive.pattern.tagConfig(strtag, msgid, operation); 408 expresso_mail_archive.currenttag = flag; 409 expresso_mail_archive.taglist = tl; 410 expresso_mail_archive.progressbar = window.setTimeout("expresso_mail_archive.tagMessage()",1); 411 } 412 else { 413 set_message_flag(msg_number,flag, func_after_flag_change); 414 } 415 //Marcosw fim 358 416 } 359 417
Note: See TracChangeset
for help on using the changeset viewer.