Changeset 8249

Timestamp:

11/06/13 16:10:50 (9 years ago)

Author:

angelo

Message:

Ticket #3493 - Atualizar bibioteca CKEditor do Expresso

Location:

trunk

Files:

• expressoMail1_2/js/rich_text_editor.js (modified) (2 diffs)
• library/ckeditor/plugins/expresso/plugin.js (modified) (1 diff)

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -338 +338 @@
                 if( RichTextEditor.editorReady === true && CKEDITOR.instances['body_'+id] !== undefined ){
                         var editor =   CKEDITOR.instances['body_'+id]; 
-                        var selection = editor.getSelection();
+                        
+                        var selection = editor.getSelection();
                         var fontSize = '';
                         var fontFamily = '';
@@ -366 +367 @@
                                 }
                                 selection.selectRanges(selectionRanges);
+                        }
+                        if (CKEDITOR.env.ie){
+                                var body = editor.document.getBody();
+                                var range = new CKEDITOR.dom.range(body);
+                                range.selectNodeContents(body);
+                                range.collapse(true);
+                                var selection = editor.getSelection();
+                                selection.selectRanges([range]);
                         }
                         

trunk/library/ckeditor/plugins/expresso/plugin.js

@@ -34 +34 @@
                    
                     onClick : function( value )
-                    {         
-                       editor.focus();
-                       editor.fire( 'saveSnapshot' );
-                       editor.insertHtml(unescape(value));
-                       editor.fire( 'saveSnapshot' );
+                    {
+                        editor.focus();
+                        editor.fire( 'saveSnapshot' );
+                        var fontSize = '';
+                        var fontFamily = '';
+                        if(typeof(preferences.font_size_editor) !== 'undefined')
+                            fontSize = 'font-size:' + preferences.font_size_editor;
+                        if(fontSize != '') 
+                            fontFamily = ';'
+                        if(typeof(preferences.font_family_editor) !== 'undefined')
+                            fontFamily += 'font-family:' + preferences.font_family_editor + ';';                         
+                        var divBr = '<div style="'+fontSize+fontFamily+'"><br type="_moz"></div>';
+                        editor.insertHtml(divBr + unescape(value));
+                        editor.fire( 'saveSnapshot' );
+                        var selection = editor.getSelection();
+                        if(selection !== undefined && selection !== null){
+                            var selectionRanges = selection.getRanges(); 
+                        }
+                        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 (CKEDITOR.env.ie){
+                            var body = editor.document.getBody();
+                            var range = new CKEDITOR.dom.range(body);
+                            range.selectNodeContents(body);
+                            range.collapse(true);
+                            var selection = editor.getSelection();
+                            selection.selectRanges([range]);
+                        }                       
                     }