Changeset 4450 for branches/2.2.0.1
- Timestamp:
- 05/19/11 09:50:56 (13 years ago)
- Location:
- branches/2.2.0.1/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/expressoMail1_2/js/main.js
r4349 r4450 1765 1765 if (data.append != true || !data) 1766 1766 { 1767 RichTextEditor.saveFlag = -1;1767 RichTextEditor.saveFlag = 0; 1768 1768 if (! data.append) 1769 1769 if(data == 'Post-Content-Length') … … 1788 1788 else 1789 1789 { 1790 RichTextEditor.saveFlag = 1;1791 1790 openTab.imapUid[border_id] = data.msg_no; 1792 1791 openTab.imapBox[border_id] = data.folder_id; … … 1910 1909 watch_changes_in_msg(border_id); 1911 1910 write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name))); 1911 setTimeout( function(){ RichTextEditor.saveFlag = 1; }, 1000 ); 1912 1912 } 1913 1913 } … … 1968 1968 1969 1969 1970 if (is_ie){ 1970 if (is_ie) 1971 { 1971 1972 var i = 0; 1972 1973 while (document.forms(i).name != "form_message_"+border_id){i++} … … 1974 1975 } 1975 1976 else 1977 { 1976 1978 form = document.forms["form_message_"+border_id]; 1979 } 1980 1977 1981 form.appendChild(textArea); 1978 1982 form.appendChild(input_folder); -
branches/2.2.0.1/expressoMail1_2/js/rich_text_editor.js
r4296 r4450 463 463 RichTextEditor.saveFlag = 0; // See if save function finished 464 464 var save_link = document.getElementById("save_message_options_"+id); 465 //save_link.onclick = function () {};466 465 save_msg(id,true); 467 setTimeout("RichTextEditor.insertImgHtml("+id+")",1000); 468 } 469 470 cRichTextEditor.prototype.insertImgHtml = function (id){ 471 if (RichTextEditor.saveFlag == 0) 472 setTimeout("RichTextEditor.insertImgHtml("+id+")",500); 466 RichTextEditor.insertImgHtml(id); 467 } 468 469 cRichTextEditor.prototype.insertImgHtml = function (id) 470 { 471 if ( RichTextEditor.saveFlag == 0 ) 472 { 473 setTimeout( function(){ RichTextEditor.insertImgHtml(id); },1000 ); 474 } 473 475 else 474 if (RichTextEditor.saveFlag == 1) 475 { 476 this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=INBOX/'+draftsfolder+'&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1)); 477 // this.editorCommand('Image', '.inc/gotodownload.php?msg_folder="+msg_folder+"&msg_number="+msg_number+"&idx_file="+idx_file+"&msg_part="+msg_part+params')); 476 { 477 if ( RichTextEditor.saveFlag == 1 ) 478 { 479 var folderNameDraft = "INBOX" + cyrus_delimiter + draftsfolder; 480 this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=' + folderNameDraft + '&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1)); 478 481 openTab.toPreserve[id] = true; 479 482 save_msg(id,true); 480 } 483 } 484 } 481 485 } 482 486 … … 570 574 form_upload.style.left = "5px"; 571 575 form_upload.name = get_lang("Upload File"); 572 form_upload.style.width = " 450px";573 form_upload.style.height = " 75px";576 form_upload.style.width = "550px"; 577 form_upload.style.height = "100px"; 574 578 form_upload.innerHTML = get_lang('Select the desired image file')+':<br>'+ 575 '<input name="image_at" maxlength="255" size="50" id="inputFile_img" type="file"><br >' +579 '<input name="image_at" maxlength="255" size="50" id="inputFile_img" type="file"><br/><br/>' + 576 580 '<input title="' + get_lang('Include') + '" value="' + get_lang('Include') + '"' + 'type="button" onclick="RichTextEditor.addInputFile();"> ' + 577 581 '<input title="' + get_lang('Close') + '" value="' + get_lang('Close') + '"' + 578 582 ' type="button" onclick="win.close()">'; 583 579 584 form.appendChild(form_upload); 580 585
Note: See TracChangeset
for help on using the changeset viewer.