Ticket #5367: 5367_2.patch

_source/core/editor.js

@@ -755 +755 @@
                         this.fire( 'insertHtml', data );
                 },
 
+                /*
+                 * Insert text content into the currently selected position in the
+                 * editor, in WYSIWYG mode, styles of the selected element will be applied to the inserted text,
+                 * spaces around the text will be leaving untouched.
+                 * <strong>Note:</strong> two subsequent line-breaks will be translated into
+                 * one enter-key in effect, result depends on {@link CKEDITOR.config.enterMode};
+                 * A single line-break will be translated into per shift-enter-key correspondingly.
+                 * @param {String} text Text to be inserted into the editor.
+                 * @example
+                 * CKEDITOR.instances.editor1.<b>insertText( ' line1 \n\n line2' )</b>;
+                 */
+                insertText : function( text )
+                {
+                        this.fire( 'insertText', text );
+                },
+
                 /**
                  * Inserts an element into the currently selected position in the
                  * editor.

_source/plugins/wysiwygarea/plugin.js

@@ -102 +102 @@
                 }
         }
 
+        function doInsertText( doc, text )
+        {
+                var selection = doc.getSelection(),
+                        range = selection.getRanges()[ 0 ];
+
+                range.insertNode( new CKEDITOR.dom.text( text, doc ) );
+                range.collapse();
+                range.select();
+        }
+
+        function doEnter( editor, mode, times, forceMode )
+        {
+                while ( times-- )
+                {
+                        CKEDITOR.plugins.enterkey[ mode == CKEDITOR.ENTER_BR ? 'enterBr' : 'enterBlock' ]
+                                        ( editor, mode, null, forceMode );
+                }
+        }
+
+        function onInsertText( evt )
+        {
+                if ( this.mode == 'wysiwyg' )
+                {
+                        this.focus();
+                        this.fire( 'saveSnapshot' );
+
+                        var text = evt.data,
+                                sel = this.getSelection(),
+                                mode = sel.getStartElement().hasAscendant( 'pre', true ) ?
+                                           CKEDITOR.ENTER_BR : this.config.enterMode,
+                                isEnterBrMode = mode == CKEDITOR.ENTER_BR,
+                                doc = this.document,
+                                self = this,
+                                line;
+
+                        // Make use of the browser to perform "extractContent".
+                        if ( CKEDITOR.env.ie )
+                                sel.getNative().createRange().pasteHTML( '' );
+                        else
+                        {
+                                var markerId = 'cke_bm_' + CKEDITOR.tools.getNextNumber() + 'S';
+                                doc.$.execCommand( 'insertHtml', false, CKEDITOR.env.gecko ?
+                                                '<span id="' + markerId + '" data-cke-bookmark=1></span>' : '' );
+
+                                // Merge the fragile inline (contextual) elements  split by Gecko.
+                                var bookmark = doc.getById( markerId ),
+                                                previous = bookmark.getPrevious();
+
+                                if ( previous && previous.type == CKEDITOR.NODE_ELEMENT && previous.getName() in CKEDITOR.dtd.$inline )
+                                        previous.mergeSiblings();
+
+                                var range = new CKEDITOR.dom.range( doc );
+                                range.moveToBookmark( { serializable : 1 , startNode: markerId } );
+                                range.select();
+                        }
+
+                        text = CKEDITOR.tools.htmlEncode( text.replace( /\r\n|\r/g, '\n' ) );
+
+                        var startIndex = 0;
+                        text.replace( /\n+/g, function( match, lastIndex )
+                        {
+                                line = text.substring( startIndex, lastIndex );
+                                startIndex = lastIndex + match.length;
+                                line.length && doInsertText( doc, line );
+
+                                var lineBreakNums = match.length,
+                                        // Duo consequence line-break as a enter block.
+                                                enterBlockTimes = isEnterBrMode ? 0 : Math.floor( lineBreakNums / 2 ),
+                                        // Per link-break as a enter br.
+                                                enterBrTimes = isEnterBrMode ? lineBreakNums : lineBreakNums % 2;
+
+                                // Line-breaks are converted to editor enter key strokes.
+                                doEnter( self, mode, enterBlockTimes );
+                                doEnter( self, CKEDITOR.ENTER_BR, enterBrTimes, isEnterBrMode ? false : true );
+                        } );
+
+                        // Insert the last text line of text.
+                        line = text.substring( startIndex, text.length );
+                        line.length && doInsertText( doc, line );
+
+                        this.fire( 'saveSnapshot' );
+                }
+        }
+
         function onInsertElement( evt )
         {
                 if ( this.mode == 'wysiwyg' )
@@ -961 +1045 @@
 
                                         editor.on( 'insertHtml', onInsertHtml, null, null, 20 );
                                         editor.on( 'insertElement', onInsertElement, null, null, 20 );
+                                        editor.on( 'insertText', onInsertText, null, null, 20 );
                                         // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
                                         editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
                                 });

_source/core/dom/element.js

@@ -721 +721 @@
                         var thisLength = thisAttribs.length,
                                 otherLength = otherAttribs.length;
 
-                        if ( !CKEDITOR.env.ie && thisLength != otherLength )
-                                return false;
-
                         for ( var i = 0 ; i < thisLength ; i++ )
                         {
                                 var attribute = thisAttribs[ i ];
 
+                                if ( attribute.nodeName == '_moz_dirty' )
+                                        continue;
+
                                 if ( ( !CKEDITOR.env.ie || ( attribute.specified && attribute.nodeName != 'data-cke-expando' ) ) && attribute.nodeValue != otherElement.getAttribute( attribute.nodeName ) )
                                         return false;
                         }

_source/plugins/specialchar/dialogs/specialchar.js

@@ -12 +12 @@
         var dialog,
                 lang = editor.lang.specialChar;
 
-        var insertSpecialChar = function ( specialChar )
-        {
-                var selection = editor.getSelection(),
-                        ranges = selection.getRanges( true ),
-                        range, textNode;
-
-                editor.fire( 'saveSnapshot' );
-
-                for ( var i = ranges.length - 1; i >= 0 ; i-- )
-                {
-                        range = ranges[ i ];
-                        range.deleteContents();
-
-                        textNode = CKEDITOR.dom.element.createFromHtml( specialChar );
-                        range.insertNode( textNode );
-                }
-
-                if ( range )
-                {
-                        range.moveToPosition( textNode, CKEDITOR.POSITION_AFTER_END );
-                        range.select();
-                }
-
-                editor.fire( 'saveSnapshot' );
-        };
-
         var onChoice = function( evt )
         {
                 var target, value;
@@ -51 +25 @@
                         target.removeClass( "cke_light_background" );
                         dialog.hide();
 
-                        // Firefox has bug on insert chars into a element use its own API. (#5170)
-                        if ( CKEDITOR.env.gecko )
-                                insertSpecialChar( value );
-                        else
-                                editor.insertHtml( value );
+                        editor.insertText( value );
                 }
         };
 

_source/plugins/pastetext/plugin.js

@@ -37 +37 @@
                 }
         };
 
-        function doInsertText( doc, text )
-        {
-                // Native text insertion.
-                if ( CKEDITOR.env.ie )
-                {
-                        var selection = doc.selection;
-                        if ( selection.type == 'Control' )
-                                selection.clear();
-                        selection.createRange().pasteHTML( text );
-                }
-                else
-                        doc.execCommand( 'inserthtml', false, text );
-        }
-
         // Register the plugin.
         CKEDITOR.plugins.add( 'pastetext',
         {
@@ -84 +70 @@
                 requires : [ 'clipboard' ]
         });
 
-        function doEnter( editor, mode, times, forceMode )
-        {
-                while ( times-- )
-                {
-                        CKEDITOR.plugins.enterkey[ mode == CKEDITOR.ENTER_BR ? 'enterBr' : 'enterBlock' ]
-                                        ( editor, mode, null, forceMode );
-                }
-        }
-
-        CKEDITOR.editor.prototype.insertText = function( text )
-        {
-                this.focus();
-                this.fire( 'saveSnapshot' );
-
-                var mode = this.getSelection().getStartElement().hasAscendant( 'pre', true ) ? CKEDITOR.ENTER_BR : this.config.enterMode,
-                        isEnterBrMode = mode == CKEDITOR.ENTER_BR,
-                        doc = this.document.$,
-                        self = this,
-                        line;
-
-                text = CKEDITOR.tools.htmlEncode( text.replace( /\r\n|\r/g, '\n' ) );
-
-                var startIndex = 0;
-                text.replace( /\n+/g, function( match, lastIndex )
-                 {
-                        line = text.substring( startIndex, lastIndex );
-                        startIndex = lastIndex + match.length;
-                        line.length && doInsertText( doc, line );
-
-                        var lineBreakNums = match.length,
-                                // Duo consequence line-break as a enter block.
-                                enterBlockTimes = isEnterBrMode ? 0 : Math.floor( lineBreakNums / 2 ),
-                                // Per link-break as a enter br.
-                                enterBrTimes = isEnterBrMode ? lineBreakNums : lineBreakNums % 2;
-
-                        // Line-breaks are converted to editor enter key strokes.
-                        doEnter( self, mode, enterBlockTimes );
-                        doEnter( self, CKEDITOR.ENTER_BR, enterBrTimes, isEnterBrMode ? false : true );
-                 });
-
-                // Insert the last text line of text.
-                line = text.substring( startIndex, text.length );
-                line.length && doInsertText( doc, line );
-
-                this.fire( 'saveSnapshot' );
-        };
 })();