Ticket #6642: 6642.patch

_source/core/dom/element.js

@@ -272 +272 @@
                  */
                 breakParent : function( parent )
                 {
-                        var range = new CKEDITOR.dom.range( this.getDocument() );
+                        var range = new CKEDITOR.dom.range( this.getDocument() ),
+                                testRange = range.clone();
 
-                        // We'll be extracting part of this element, so let's use our
-                        // range to get the correct piece.
-                        range.setStartAfter( this );
-                        range.setEndAfter( parent );
-
-                        // Extract it.
-                        var docFrag = range.extractContents();
+                        testRange.setStartBefore( this );
+                        testRange.setEndAfter( this );
+
+                        var atStart = testRange.checkBoundaryOfElement( parent, CKEDITOR.START ),
+                                atEnd = testRange.checkBoundaryOfElement( parent, CKEDITOR.END );
+
+                        if ( atStart || atEnd )
+                                this[ atStart ? 'insertBefore' : 'insertAfter' ]( parent );
+                        else
+                        {
+                                // We'll be extracting part of this element, so let's use our
+                                // range to get the correct piece.
+                                range.setStartAfter( this );
+                                range.setEndAfter( parent );
+                                // Extract it.
+                                var docFrag = range.extractContents();
 
-                        // Move the element outside the broken element.
-                        range.insertNode( this.remove() );
+                                // Move the element outside the broken element.
+                                range.insertNode( this.remove() );
 
-                        // Re-insert the extracted piece after the element.
-                        docFrag.insertAfterNode( this );
+                                // Re-insert the extracted piece after the element.
+                                docFrag.insertAfterNode( this );
+                        }
                 },
 
                 contains :

_source/plugins/wysiwygarea/plugin.js

@@ -46 +46 @@
                 };
         }
 
+        function isDtdValid( element )
+        {
+                var parent = element.getParent().getName();
+                var dtd = CKEDITOR.dtd[ parent ];
+                return !dtd || parent == 'body' || element.getName() in dtd;
+        }
+
+        function postFixPaste( root )
+        {
+                var doc = root.getDocument();
+                var sel = doc.getSelection();
+                var bms = sel.createBookmarks();
+                var range = new CKEDITOR.dom.range();
+                range.selectNodeContents( root );
+                var walker = new CKEDITOR.dom.walker( range );
+
+                // Collect invalid structured and wrongly styled (Webkit only) elements for later fixing.
+                var next, invalids = [], extras = [], type = CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT );
+                walker.evaluator = type;
+                while( next = walker.next() )
+                {
+                        if ( !isDtdValid( next ) )
+                                invalids.push( next );
+
+                        if ( next.is( 'span' ) && next.hasClass( 'Apple-style-span' ) )
+                                extras.push( next );
+                }
+
+                for ( var i = 0, toFix; toFix = invalids[ i ], i < invalids.length; i++ )
+                {
+                        // Correct them by splitting upward.
+                        do
+                                toFix.breakParent( toFix.getParent() );
+                        while( !isDtdValid( toFix ) )
+                }
+
+                for ( var j = 0, extra; extra = extras[ j ], j < extras.length; j++ )
+                        extra.remove( 1 );
+
+                sel.selectBookmarks( bms );
+        }
+
         function doInsertHtml( data )
         {
                 if ( this.dataProcessor )
@@ -54 +96 @@
                 if ( !data )
                         return;
 
+                data = '<span id="cke_paste_marker"></span>' + data;
+
                 // HTML insertion only considers the first range.
                 var selection = this.getSelection(),
                         range = selection.getRanges()[ 0 ];
@@ -61 +105 @@
                 if ( range.checkReadOnly() )
                         return;
 
-                // Opera: force block splitting when pasted content contains block. (#7801)
-                if ( CKEDITOR.env.opera )
-                {
-                        var path = new CKEDITOR.dom.elementPath( range.startContainer );
-                        if ( path.block )
-                        {
-                                var nodes = CKEDITOR.htmlParser.fragment.fromHtml( data, false ).children;
-                                for ( var i = 0, count = nodes.length; i < count; i++ )
-                                {
-                                        if ( nodes[ i ]._.isBlockLike )
-                                        {
-                                                range.splitBlock( this.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );
-                                                range.insertNode( range.document.createText( '' ) );
-                                                range.select();
-                                                break;
-                                        }
-                                }
-                        }
-                }
-
-                if ( CKEDITOR.env.ie )
-                {
-                        var selIsLocked = selection.isLocked;
+                var selIsLocked = selection.isLocked;
 
-                        if ( selIsLocked )
-                                selection.unlock();
+                selIsLocked && selection.unlock();
 
+                if ( CKEDITOR.env.ie )
+                {
                         var $sel = selection.getNative();
 
                         // Delete control selections to avoid IE bugs on pasteHTML.
@@ -117 +140 @@
                                 $sel.createRange().pasteHTML( data );
                         }
                         catch (e) {}
-
-                        if ( selIsLocked )
-                                this.getSelection().lock();
                 }
                 else
                         this.document.$.execCommand( 'inserthtml', false, data );
 
+                // Figure out where the pasted contents start.
+                var marker = this.document.getById( 'cke_paste_marker' );
+                var pastedStart = marker.getNextSourceNode( 1 );
+                marker.remove( 1 );
+                var path = new CKEDITOR.dom.elementPath( pastedStart );
+
+                // Fix run at the path root.
+                var root = path.elements[ path.elements.length - 2 ];
+                root && postFixPaste( root );
+
+                selIsLocked && this.getSelection().lock();
+
                 // Webkit does not scroll to the cursor position after pasting (#5558)
                 if ( CKEDITOR.env.webkit )
                 {