Ticket #3136: 3136.patch

_source/plugins/wysiwygarea/plugin.js

@@ -36 +36 @@
                                 isBlock = CKEDITOR.dtd.$block[ elementName ];
 
                         var selection = this.getSelection(),
-                                ranges = selection.getRanges();
+                                range = selection.getRanges().pop();
 
-                        var range, clone, lastElement, bookmark;
+                        // Remove the original contents.
+                        range.deleteContents();
 
-                        for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
+                        var toSplit;
+
+                        // If the new node is a block element, split the current block (if any).
+                        if ( this.config.enterMode != 'br' && isBlock )
                         {
-                                range = ranges[ i ];
+                                var startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
+                                        j = 0,
+                                        parent;
 
-                                // Remove the original contents.
-                                range.deleteContents();
-
-                                clone = element.clone( true );
-
-                                var toSplit;
-
-                                // If the new node is a block element, split the current block (if any).
-                                if ( this.config.enterMode != 'br' && isBlock )
+                                while( ( parent = startPath.elements[ j++ ] ) && parent != startPath.blockLimit )
                                 {
-                                        var startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
-                                                j = 0,
-                                                parent;
+                                        var parentName = parent.getName(),
+                                                parentDtd = CKEDITOR.dtd[ parentName ];
 
-                                        while( ( parent = startPath.elements[ j++ ] ) && parent != startPath.blockLimit )
-                                        {
-                                                var parentName = parent.getName(),
-                                                        parentDtd = CKEDITOR.dtd[ parentName ];
-
-                                                if ( parentDtd && !parentDtd[ elementName ] )
-                                                        toSplit = parent;
-                                        }
+                                        if ( parentDtd && !parentDtd[ elementName ] )
+                                                toSplit = parent;
                                 }
+                        }
 
-                                // Insert the new node.
-                                range.insertNode( clone );
+                        // Insert the new node.
+                        range.insertNode( element );
 
-                                if ( toSplit )
-                                        clone.breakParent( toSplit );
+                        if ( toSplit )
+                                element.breakParent( toSplit );
 
-                                // Save the last element reference so we can make the
-                                // selection later.
-                                if ( !lastElement )
-                                        lastElement = clone;
-                        }
+                        range.moveToPosition( element, CKEDITOR.POSITION_AFTER_END );
 
-                        range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
-
-                        var next = lastElement.getNextSourceNode( true );
+                        var next = element.getNextSourceNode( true );
                         if ( next && next.type == CKEDITOR.NODE_ELEMENT )
                                 range.moveToElementEditStart( next );