Ticket #4738: 4738.patch

_source/plugins/wysiwygarea/plugin.js

@@ -88 +88 @@
                                                         && ( dtd = CKEDITOR.dtd[ current.getName() ] )
                                                         && !( dtd && dtd [ elementName ] ) )
                                         {
+                                                // Split up inline elements.
+                                                if( current.getName() in CKEDITOR.dtd.span )
+                                                        range.splitElement( current );
                                                 // If we're in an empty block which indicate a new paragraph,
                                                 // simply replace it with the inserting block.(#3664)
-                                                if ( range.checkStartOfBlock()
+                                                else if ( range.checkStartOfBlock()
                                                          && range.checkEndOfBlock() )
                                                 {
                                                         range.setStartBefore( current );

_source/core/dom/range.js

@@ -1458 +1458 @@
                                 }
                                 else
                                 {
-                                        // Extract the contents of the block from the selection point to the end
-                                        // of its contents.
-                                        this.setEndAt( startBlock, CKEDITOR.POSITION_BEFORE_END );
-                                        var documentFragment = this.extractContents();
-
-                                        // Duplicate the block element after it.
-                                        endBlock = startBlock.clone( false );
-
-                                        // Place the extracted contents into the duplicated block.
-                                        documentFragment.appendTo( endBlock );
-                                        endBlock.insertAfter( startBlock );
-                                        this.moveToPosition( startBlock, CKEDITOR.POSITION_AFTER_END );
-
+                                        this.splitElement( startBlock );
                                         // In Gecko, the last child node must be a bogus <br>.
                                         // Note: bogus <br> added under <ul> or <ol> would cause
                                         // lists to be incorrectly rendered.
@@ -1489 +1477 @@
                 },
 
                 /**
+                 * Branch the specified element from the collapsed range position and
+                 * place the caret between the two result branches.
+                 * Note: The range must be collapsed and been enclosed by this element.
+                 * @param {CKEDITOR.dom.element} element
+                 */
+                splitElement : function( toSplit )
+                {
+                        if( !this.collapsed )
+                                return;
+
+                        // Extract the contents of the block from the selection point to the end
+                        // of its contents.
+                        this.setEndAt( toSplit, CKEDITOR.POSITION_BEFORE_END );
+                        var documentFragment = this.extractContents();
+
+                        // Duplicate the element after it.
+                        var clone = toSplit.clone( false );
+
+                        // Place the extracted contents into the duplicated element.
+                        documentFragment.appendTo( clone );
+                        clone.insertAfter( toSplit );
+                        this.moveToPosition( toSplit, CKEDITOR.POSITION_AFTER_END );
+                },
+
+                /**
                  * Check whether current range is on the inner edge of the specified element.
                  * @param {Number} checkType ( CKEDITOR.START | CKEDITOR.END ) The checking side.
                  * @param {CKEDITOR.dom.element} element The target element to check.