Ticket #6107: 6107.patch

_source/plugins/styles/plugin.js

@@ -738 +738 @@
 
                 while ( ( block = iterator.getNextParagraph() ) )               // Only one =
                 {
-                        var newBlock = getElement( this, doc );
-                        replaceBlock( block, newBlock );
+                        var newBlock = getElement( this, doc ),
+                                def = this._.definition,
+                                attributes = def.attributes,
+                                styles = def.styles;
+
+                        if ( block.getName() == def.element )
+                        {
+                                for ( var attName in attributes )
+                                {
+                                        if ( newBlock.getAttribute( attName ) == block.getAttribute( attName ) )
+                                                newBlock.removeAttribute( attName );
+                                }
+
+                                for ( var styleName in styles )
+                                {
+                                        if ( newBlock.getStyle( styleName ) == block.getStyle( styleName ) )
+                                                newBlock.removeStyle( styleName );
+                                }
+
+                                if ( newBlock.hasAttributes() )
+                                        replaceBlock( block, newBlock )
+                                else
+                                        removeBlockStyle( block, this._.enterMode );
+                        }
+                        else
+                                replaceBlock( block, newBlock )
+                        
                 }
 
                 range.moveToBookmark( bookmark );
         }
+        function removeBlockStyle( block, enterMode )
+        {
+                if ( enterMode == CKEDITOR.ENTER_BR )
+                        block.remove( true );
+                else
+                        replaceBlock( block, new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ) );
+        }
 
         // Replace the original block with new one, with special treatment
         // for <pre> blocks to make sure content format is well preserved, and merging/splitting adjacent