Changeset 5973 for trunk/expressoMail1_2/js
- Timestamp:
- 04/19/12 14:02:45 (12 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5963 r5973 1726 1726 1727 1727 if (preferences.use_signature == "1"){ 1728 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div> ' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true);1728 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true); 1729 1729 }else{ 1730 1730 RichTextEditor.setInitData(new_border_ID,block_quoted_body,true); … … 1743 1743 // Insert the signature automaticaly at message body if use_signature preference is set 1744 1744 if (preferences.use_signature == "1"){ 1745 $("#body_"+new_border_ID).val('<div><br type="_moz"></div> ' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));1745 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 1746 1746 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 1747 1747 content.find(".to").focus(); 1748 1748 } 1749 1749 else{ 1750 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>'+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));1751 1750 RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 1751 //RichTextEditor.val('<div><br type="_moz"></div><div><br type="_moz"></div>'+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 1752 1752 content.find(".to").focus(); 1753 1753 } … … 1775 1775 // Insert the signature automaticaly at message body if use_signature preference is set 1776 1776 if (preferences.use_signature == "1"){ 1777 $("#body_"+new_border_ID).val('<div><br type="_moz"></div> ' + signature);1777 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>' + signature); 1778 1778 RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature); 1779 1779 content.find(".to").focus(); -
trunk/expressoMail1_2/js/rich_text_editor.js
r5962 r5973 10 10 this.plain = new Array; 11 11 this.editorReady = true; 12 this.hoho = ''; 12 13 } 13 14 … … 240 241 CKEDITOR.instances[id].setData(data) 241 242 } 242 cRichTextEditor.prototype.setInitData = function (id,data,reply,recursion ){243 cRichTextEditor.prototype.setInitData = function (id,data,reply,recursion, callback){ 243 244 var content = $("#content_id_"+id); 244 245 if(recursion === undefined){ … … 282 283 editor.insertHtml(divBr+data); 283 284 editor.focus(); 284 } 285 } 286 287 if(selection !== null){ 288 if(selectionRanges[selectionRanges.length-1] !== undefined){ 289 selectionRanges[selectionRanges.length-1].setStart(selectionRanges[selectionRanges.length-1].getTouchedStartNode().getParents()[1].getChild(0), 0); 290 selectionRanges[selectionRanges.length-1].setEnd(selectionRanges[selectionRanges.length-1].getTouchedStartNode().getParents()[1].getChild(0), 0); 291 } 292 selection.selectRanges(selectionRanges); 293 } 285 294 286 if(selection !== null){287 selection.selectRanges(selectionRanges);288 }289 295 if (is_webkit){ 290 296 $('#cke_contents_body_'+id+'>iframe').scrollTo(':first'); 291 297 } 292 298 if(callback !== undefined) 299 callback(); 293 300 } 294 301 else if(recursion < 20){
Note: See TracChangeset
for help on using the changeset viewer.