Ticket #7037: 7037_2.patch

_source/plugins/styles/plugin.js

@@ -895 +895 @@
 
                 var block;
                 while ( ( block = iterator.getNextParagraph() ) )
-                        this.checkElementRemovable( block ) && removeFromElement( this, block, 1 );
+                {
+                        if ( this.checkElementRemovable( block ) )
+                        {
+                                // <pre> get special treatment.
+                                if ( block.is( 'pre' ) )
+                                {
+                                        var newBlock = this._.enterMode == CKEDITOR.ENTER_BR ?
+                                                                null : range.document.createElement(
+                                                                        this._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );
 
+                                        newBlock && block.copyAttributes( newBlock );
+                                        replaceBlock( block, newBlock );
+                                }
+                                else
+                                         removeFromElement( this, block, 1 );
+                        }
+                }
+
                 range.moveToBookmark( bookmark );
         }
 
@@ -905 +921 @@
         // when necessary.(#3188)
         function replaceBlock( block, newBlock )
         {
-                var newBlockIsPre       = newBlock.is( 'pre' );
-                var blockIsPre          = block.is( 'pre' );
+                // Block is to be removed, create a temp element to
+                // save contents.
+                var removeBlock = !newBlock;
+                if ( removeBlock )
+                {
+                        newBlock = block.getDocument().createElement( 'div' );
+                        block.copyAttributes( newBlock );
+                }
+
+                var newBlockIsPre       = newBlock && newBlock.is( 'pre' );
+                var blockIsPre  = block.is( 'pre' );
 
                 var isToPre     = newBlockIsPre && !blockIsPre;
                 var isFromPre   = !newBlockIsPre && blockIsPre;
@@ -915 +940 @@
                         newBlock = toPre( block, newBlock );
                 else if ( isFromPre )
                         // Split big <pre> into pieces before start to convert.
-                        newBlock = fromPres( splitIntoPres( block ), newBlock );
+                        newBlock = fromPres( removeBlock ?
+                                                [ block.getHtml() ] : splitIntoPres( block ), newBlock );
                 else
                         block.moveChildren( newBlock );
 
@@ -926 +952 @@
                         // Merge previous <pre> blocks.
                         mergePre( newBlock );
                 }
+                else if ( removeBlock )
+                        removeNoAttribsElement( newBlock );
         }
 
         var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 );
@@ -1002 +1030 @@
          */
         function fromPres( preHtmls, newBlock )
         {
-                var docFrag = new CKEDITOR.dom.documentFragment( newBlock.getDocument() );
+                var docFrag;
+                if ( preHtmls.length > 1 )
+                        docFrag = new CKEDITOR.dom.documentFragment( newBlock.getDocument() );
+
                 for ( var i = 0 ; i < preHtmls.length ; i++ )
                 {
                         var blockHtml = preHtmls[ i ];
@@ -1032 +1063 @@
                                                 return CKEDITOR.tools.repeat( '&nbsp;', match.length - 1 ) + ' ' ;
                                         } ) ;
 
-                        var newBlockClone = newBlock.clone();
-                        newBlockClone.setHtml(  blockHtml );
-                        docFrag.append( newBlockClone );
-                }
-                return docFrag;
-        }
+                        if ( docFrag )
+                        {
+                                var newBlockClone = newBlock.clone();
+                                newBlockClone.setHtml(  blockHtml );
+                                docFrag.append( newBlockClone );
+                        }
+                        else
+                                newBlock.setHtml( blockHtml );
+                }
 
+                return docFrag || newBlock;
+        }
+
         /**
          * Converting from a non-PRE block to a PRE block in formatting operations.
          */