Ticket #6107: 6107_3.patch

_source/plugins/format/plugin.js

@@ -54 +54 @@
                                         editor.focus();
                                         editor.fire( 'saveSnapshot' );
 
-                                        styles[ value ].apply( editor.document );
+                                        var style = styles[ value ],
+                                                elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() );
 
+                                        style[ style.checkActive( elementPath ) ? 'remove' : 'apply' ]( editor.document );
+
                                         // Save the undo snapshot after all changes are affected. (#4899)
                                         setTimeout( function()
                                         {

_source/plugins/styles/plugin.js

@@ -149 +149 @@
                         return ( this.removeFromRange =
                                                 this.type == CKEDITOR.STYLE_INLINE ?
                                                         removeInlineStyle
+                                                : this.type == CKEDITOR.STYLE_BLOCK ?
+                                                        removeBlockStyle
                                                 : this.type == CKEDITOR.STYLE_OBJECT ?
                                                         removeObjectStyle
                                                 : null ).call( this, range );
@@ -881 +883 @@
                 range.moveToBookmark( bookmark );
         }
 
+        function removeBlockStyle( range )
+        {
+                // Serializible bookmarks is needed here since
+                // elements may be merged.
+                var bookmark = range.createBookmark( 1 );
+
+                var iterator = range.createIterator();
+                iterator.enforceRealBlocks = true;
+                iterator.enlargeBr = this._.enterMode != CKEDITOR.ENTER_BR;
+
+                var block;
+                while ( ( block = iterator.getNextParagraph() ) )
+                {
+                        if ( !this.checkElementRemovable( block ) )
+                                continue;
+
+                        removeFromElement( this, block, 1 );
+                }
+
+                range.moveToBookmark( bookmark );
+        }
+
         // 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
         // when necessary.(#3188)
@@ -1057 +1081 @@
         }
 
         // Removes a style from an element itself, don't care about its subtree.
-        function removeFromElement( style, element )
+        function removeFromElement( style, element, removeMatch )
         {
                 var def = style._.definition,
                         attributes = CKEDITOR.tools.extend( {}, def.attributes, getOverrides( style )[ element.getName() ] ),
@@ -1087 +1111 @@
                         element.removeStyle( styleName );
                 }
 
-                removeEmpty && removeNoAttribsElement( element );
+                // Rename the element if the element is the same element in the style definition and has attributes left.
+                if ( removeEmpty && removeMatch && element.hasAttributes() && element.getName() == def.element )
+                        element.renameNode( CKEDITOR.dtd.$inline[ element.getName() ] ? 'span' : style._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );
+                else if ( removeEmpty )
+                        removeNoAttribsElement( element );
         }
 
         // Removes a style from inside an element.
@@ -1433 +1461 @@
 
                 var iterator = ranges.createIterator();
                 while ( ( range = iterator.getNextRange() ) )
-                {
                         func.call( this, range );
-                }
 
                 selection.selectRanges( ranges );
 

_source/plugins/stylescombo/plugin.js

@@ -106 +106 @@
 
                                                 var elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() );
 
-                                                if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
-                                                        style.remove( editor.document );
-                                                else if ( style.type == CKEDITOR.STYLE_OBJECT && style.checkActive( elementPath ) )
-                                                        style.remove( editor.document );
-                                                else
-                                                        style.apply( editor.document );
+                                                style[ style.checkActive( elementPath ) ? 'remove' : 'apply' ]( editor.document );
 
                                                 editor.fire( 'saveSnapshot' );
                                         },