Ticket #6107: 6107_8.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() ) )
+                        this.checkElementRemovable( block ) && 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)
@@ -1090 +1109 @@
                         element.removeStyle( styleName );
                 }
 
-                removeEmpty && removeNoAttribsElement( element );
+                if ( removeEmpty )
+                {
+                        !CKEDITOR.dtd.$block[ element.getName() ] || style._.enterMode == CKEDITOR.ENTER_BR && !element.hasAttributes() ?
+                                removeNoAttribsElement( element ) :
+                                element.renameNode( style._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );
+                }
         }
 
         // Removes a style from inside an element.
@@ -1160 +1184 @@
                 removeNoAttribsElement( element );
         }
 
+        var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 );
         // If the element has no more attributes, remove it.
         function removeNoAttribsElement( element )
         {
@@ -1167 +1192 @@
                 // leaving its children.
                 if ( !element.hasAttributes() )
                 {
-                        // Removing elements may open points where merging is possible,
-                        // so let's cache the first and last nodes for later checking.
-                        var firstChild  = element.getFirst();
-                        var lastChild   = element.getLast();
+                        if ( CKEDITOR.dtd.$block[ element.getName() ] )
+                        {
+                                var previous = element.getPrevious( nonWhitespaces ),
+                                                next = element.getNext( nonWhitespaces );
 
-                        element.remove( true );
+                                if ( previous && ( previous.type == CKEDITOR.NODE_TEXT || !previous.isBlockBoundary( { br : 1 } ) ) )
+                                        element.append( 'br', 1 );
+                                if ( next && ( next.type == CKEDITOR.NODE_TEXT || !next.isBlockBoundary( { br : 1 } ) ) )
+                                        element.append( 'br' );
 
-                        if ( firstChild )
+                                element.remove( true );
+                        }
+                        else
                         {
-                                // Check the cached nodes for merging.
-                                firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.mergeSiblings();
+                                // Removing elements may open points where merging is possible,
+                                // so let's cache the first and last nodes for later checking.
+                                var firstChild = element.getFirst();
+                                var lastChild = element.getLast();
 
-                                if ( lastChild && !firstChild.equals( lastChild )
-                                        && lastChild.type == CKEDITOR.NODE_ELEMENT  )
-                                        lastChild.mergeSiblings();
+                                element.remove( true );
+
+                                if ( firstChild )
+                                {
+                                        // Check the cached nodes for merging.
+                                        firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.mergeSiblings();
+
+                                        if ( lastChild && !firstChild.equals( lastChild )
+                                                        && lastChild.type == CKEDITOR.NODE_ELEMENT )
+                                                lastChild.mergeSiblings();
+                                }
+
                         }
                 }
         }
@@ -1436 +1477 @@
 
                 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' );
                                         },