Ticket #8386: Fix_working_copy.patch

_source/plugins/wysiwygarea/plugin.js

@@ -21 +21 @@
         function checkReadOnly( selection )
         {
                 if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
                         return selection.getSelectedElement().isReadOnly();
                 else
                         return selection.getCommonAncestor().isReadOnly();
         }
+        
+        function cleanupOnInsertHtmlTest(selection, htmlData){
+                        
+                        var ranges = selection.getRanges(),
+                                element = CKEDITOR.dom.element.createFromHtml(htmlData),
+                                elementName = element.getName(),
+                                isBlock = CKEDITOR.dtd.$block[ elementName ];
+
+                        var range;
+
+                        for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
+                        {
+                                range = ranges[ i ];
+
+                                // Remove the original contents.
+                                range.deleteContents();
+
+                                // If we're inserting a block at dtd-violated position, split
+                                // the parent blocks until we reach blockLimit.
+                                var current, dtd;
+                                if ( isBlock )
+                                {
+                                        while ( ( current = range.getCommonAncestor( 0, 1 ) )
+                                                        && ( 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)
+                                                else if ( range.checkStartOfBlock()
+                                                         && range.checkEndOfBlock() )
+                                                {
+                                                        range.setStartBefore( current );
+                                                        range.collapse( true );
+                                                        current.remove();
+                                                }
+                                                else
+                                                        range.splitBlock();
+                                        }
+                                }
+                        }
+
+                        selection.selectRanges( [ range ] );
+
+                        return ;
+        }
 
         function onInsertHtml( evt )
         {
                 if ( this.mode == 'wysiwyg' )
                 {
                         this.focus();
 
@@ -38 +86 @@
 
                         var data = evt.data;
                         this.fire( 'saveSnapshot' );
 
                         if ( this.dataProcessor )
                                 data = this.dataProcessor.toHtml( data );
 
+                        cleanupOnInsertHtmlTest(selection,data);
+                        
                         if ( CKEDITOR.env.ie )
                         {
                                 var selIsLocked = selection.isLocked;
 
                                 if ( selIsLocked )
                                         selection.unlock();