Ticket #6107: 6107_5.patch

_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' );
                                         },

_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/core/dom/walker.js

@@ -345 +345 @@
                                 || nodeNameMatches[ this.getName() ];
         };
 
-        CKEDITOR.dom.walker.blockBoundary = function( customNodeNames )
+        CKEDITOR.dom.walker.blockBoundary = function( customNodeNames, isReject )
         {
                 return function( node , type )
                 {
-                        return ! ( node.type == CKEDITOR.NODE_ELEMENT
-                                                && node.isBlockBoundary( customNodeNames ) );
+                        return !! ( isReject ^ ( node.type == CKEDITOR.NODE_ELEMENT
+                                                && node.isBlockBoundary( customNodeNames ) ) );
                 };
         };
 
-        CKEDITOR.dom.walker.listItemBoundary = function()
+        CKEDITOR.dom.walker.listItemBoundary = function( isReject )
         {
-                        return this.blockBoundary( { br : 1 } );
+                return this.blockBoundary( { br : 1 }, isReject );
         };
 
         /**

_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 ?
+                                        blockToBrs( element ) :
+                                        element.renameNode( style._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) )
+                                : removeNoAttribsElement( element );
+                }
+        }
 
         // Removes a style from inside an element.
         function removeFromInsideElement( style, element )
@@ -1186 +1212 @@
                 }
         }
 
+        var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 );
+        function blockToBrs( block )
+        {
+                var previous = block.getPrevious( nonWhitespaces ),
+                        next = block.getNext( nonWhitespaces );
+
+                if ( previous && ( previous.type == CKEDITOR.NODE_TEXT || !previous.isBlockBoundary( { br : 1 } ) ) )
+                        block.append( 'br', 1 );
+                if ( next && ( next.type == CKEDITOR.NODE_TEXT || !next.isBlockBoundary( { br : 1 } ) ) )
+                        block.append( 'br' );
+
+                block.remove( 1 );
+        }
+
         function getElement( style, targetDocument, element )
         {
                 var el;
@@ -1436 +1476 @@
 
                 var iterator = ranges.createIterator();
                 while ( ( range = iterator.getNextRange() ) )
-                {
                         func.call( this, range );
-                }
 
                 selection.selectRanges( ranges );
 

_source/core/dom/range.js

@@ -1187 +1187 @@
                                             blockBoundary,  // The node on which the enlarging should stop.
                                                 tailBr, // In case BR as block boundary.
                                             notBlockBoundary = CKEDITOR.dom.walker.blockBoundary(
-                                                                ( unit == CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS ) ? { br : 1 } : null ),
+                                                                ( unit == CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS ) ? { br : 1 } : null, 1 ),
                                                 // Record the encountered 'blockBoundary' for later use.
                                                 boundaryGuard = function( node )
                                                 {