Changeset 5973

Timestamp:

04/19/12 14:02:45 (12 years ago)

Author:

gustavo

Message:

Ticket #2611 - Refatorar interface de criação de nova mensagem

Location:

trunk/expressoMail1_2/js

Files:

• main.js (modified) (3 diffs)
• rich_text_editor.js (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -1726 +1726 @@
                         
                         if (preferences.use_signature == "1"){  
-                                RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true); 
+                                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); 
                         }else{                
                                 RichTextEditor.setInitData(new_border_ID,block_quoted_body,true); 
@@ -1743 +1743 @@
                         // Insert the signature automaticaly at message body if use_signature preference is set
                         if (preferences.use_signature == "1"){ 
-                                $("#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));
+                                $("#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));
                         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)); 
                                 content.find(".to").focus();
                         }
                         else{   
-                                $("#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));
                                 RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));   
+                                //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));
                                 content.find(".to").focus();
                         }
@@ -1775 +1775 @@
                         // Insert the signature automaticaly at message body if use_signature preference is set
                          if (preferences.use_signature == "1"){ 
-                                $("#body_"+new_border_ID).val('<div><br type="_moz"></div>' + signature);
+                                $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>' + signature);
                                 RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature);
                                 content.find(".to").focus();

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -10 +10 @@
     this.plain = new Array;
     this.editorReady = true;
+        this.hoho = '';
 }
 
@@ -240 +241 @@
         CKEDITOR.instances[id].setData(data)
 }
-cRichTextEditor.prototype.setInitData = function (id,data,reply,recursion){
+cRichTextEditor.prototype.setInitData = function (id,data,reply,recursion, callback){
         var content = $("#content_id_"+id);
         if(recursion === undefined){
@@ -282 +283 @@
                                         editor.insertHtml(divBr+data);
                                 editor.focus();
-                        }                       
+                        }
+
+                        if(selection !== null){ 
+                                if(selectionRanges[selectionRanges.length-1] !== undefined){
+                                        selectionRanges[selectionRanges.length-1].setStart(selectionRanges[selectionRanges.length-1].getTouchedStartNode().getParents()[1].getChild(0), 0);
+                                        selectionRanges[selectionRanges.length-1].setEnd(selectionRanges[selectionRanges.length-1].getTouchedStartNode().getParents()[1].getChild(0), 0);
+                                }
+                                selection.selectRanges(selectionRanges);
+                        }
                         
-                        if(selection !== null){
-                                selection.selectRanges(selectionRanges); 
-                        }
                         if (is_webkit){
                                 $('#cke_contents_body_'+id+'>iframe').scrollTo(':first');
                         }
-
+                        if(callback !== undefined)
+                                callback();
                 }
                 else if(recursion < 20){