Changeset 7557 for branches/2.4/expressoMail1_2
- Timestamp:
- 11/23/12 11:57:42 (12 years ago)
- Location:
- branches/2.4/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/expressoMail1_2/js/abas.js
r7228 r7557 505 505 { 506 506 507 if($("#border_id_"+ID).attr("title") == get_lang("New Message")){507 /*if($("#border_id_"+ID).attr("title") == get_lang("New Message")){ 508 508 var to = $("#content_id_"+ID).find(".to").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".to").val(); 509 509 var cc = $("#content_id_"+ID).find(".cc").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".cc").val(); … … 525 525 } 526 526 } 527 var bolExecuteClose = true; 527 */ 528 if($("#content_id_"+currentTab+" textarea[name=input_to]").length ){ 529 if($("#content_id_"+currentTab+" .save").is(':disabled') ) { 530 close_delete(ID, msg_sent); 531 } else if( $("#content_id_"+currentTab+" .save").is(':enabled') ) { 532 return(draftTests(ID, msg_sent)); 533 } 534 } else { 535 close_delete(ID, msg_sent); 536 } 537 538 /*var bolExecuteClose = true; 528 539 var borderElem = Element("border_id_" + ID); 529 540 if (borderElem){ … … 545 556 } 546 557 delete(openTab.type[ID]); 547 return true; 558 return true;*/ 559 delete(openTab.type[ID]); 548 560 } 549 561 -
branches/2.4/expressoMail1_2/js/main.js
r7554 r7557 2038 2038 var content = $("#content_id_"+new_border_ID); 2039 2039 2040 //It is verifying if the message was modified or not. 2041 var btnSaveVerify = function(){ 2042 $("#content_id_"+currentTab+" .save").button("disable") 2043 2044 2045 $("#content_id_"+currentTab+" .to").keydown(function() { 2046 $("#content_id_"+currentTab+" .save").button("enable"); 2047 } ); 2048 $("#content_id_"+currentTab+" input[name=input_subject]").keydown(function() { 2049 $("#content_id_"+currentTab+" .save").button("enable"); 2050 } ); 2051 2052 RichTextEditor.keydown(new_border_ID); 2053 } 2040 2054 switch(type){ 2041 2055 case "reply_without_history": 2056 btnSaveVerify(); 2057 2042 2058 RichTextEditor.replyController = true; //Seta o editor como modo reply 2043 2059 content.find('[name="input_to"]').val(data.to); … … 2056 2072 break; 2057 2073 case "reply_with_history": 2074 btnSaveVerify(); 2075 2058 2076 RichTextEditor.replyController = true; //Seta o editor como modo reply 2059 2077 title = "Re: " + html_entities(data.subject); … … 2075 2093 break; 2076 2094 case "reply_to_all_without_history": 2095 btnSaveVerify(); 2096 2077 2097 RichTextEditor.replyController = true; //Seta o editor como modo reply 2078 2098 // delete user email from to_all array. … … 2121 2141 break; 2122 2142 case "reply_to_all_with_history": 2143 btnSaveVerify(); 2144 2123 2145 RichTextEditor.replyController = true; //Seta o editor como modo reply 2124 2146 //delete user email from to_all array. … … 2175 2197 break; 2176 2198 case "forward": 2199 btnSaveVerify(); 2200 2177 2201 title = "Fw: " + html_entities(data.subject); 2178 2202 content.find(".subject").val("Fw: " + data.subject); … … 2198 2222 break; 2199 2223 case "new": 2224 btnSaveVerify(); 2225 2200 2226 title = get_lang("New Message"); 2201 2227 if(Element('msg_number').value) { … … 2227 2253 break; 2228 2254 case "edit": 2229 2255 btnSaveVerify(); 2256 2230 2257 if(flagged == 'F') 2231 2258 $(".important").addClass("expressomail-button-icon-ative"); … … 3085 3112 function autoSave( ID ) 3086 3113 { 3114 var content = $("#content_id_"+border_id); 3115 content.find(".save").button('option','disabled',true); 3116 3087 3117 saveButtonDisabled = $("#content_id_"+ID).find(".save").button('option','disabled'); 3088 3118 if(autoSaveControl.status[ID] === false && !saveButtonDisabled) … … 3091 3121 3092 3122 function save_msg(border_id){ 3093 3123 3094 3124 //seta o status do auto_save = true 3095 3125 if (preferences.auto_save_draft == 1) -
branches/2.4/expressoMail1_2/js/rich_text_editor.js
r6754 r7557 363 363 element.setAttribute('contentEditable','true'); 364 364 } 365 cRichTextEditor.prototype.keydown = function (id,rec){ 366 if (rec === undefined) rec = 1; 367 rec++; 368 if( CKEDITOR.instances['body_'+ id] === undefined ) return; 369 var element = CKEDITOR.instances['body_'+ id]; 370 371 if(element.document){ 372 element.document.on('keydown',function(){ 373 $("#content_id_"+currentTab+" .save").button("enable"); 374 }); 375 } else { 376 if (rec <= 20) 377 setTimeout(function(){RichTextEditor.keydown(id,rec)},500); 378 } 379 } 365 380 //Build the Object 366 381 RichTextEditor = new cRichTextEditor();
Note: See TracChangeset
for help on using the changeset viewer.