Ticket #7498: 7498_2.patch

_source/plugins/colorbutton/plugin.js

@@ -121 +121 @@
                                         editor.fire( 'saveSnapshot' );
 
                                         // Clean up any conflicting style within the range.
-                                        new CKEDITOR.style( config['colorButton_' + type + 'Style'], { color : 'inherit' } ).remove( editor.document );
+                                        new CKEDITOR.style( CKEDITOR.tools.extend( config['colorButton_' + type + 'Style'], { splitOnRemove : 1 } ), { color : 'inherit' } ).remove( editor.document );
 
                                         if ( color )
                                         {

_source/plugins/styles/plugin.js

@@ -654 +654 @@
                 range.enlarge( CKEDITOR.ENLARGE_ELEMENT, 1 );
 
                 var bookmark = range.createBookmark(),
-                        startNode = bookmark.startNode;
+                        startNode = bookmark.startNode,
+                        endNode = bookmark.endNode,
+                        me = this;
 
+                /*
+                 * Find out the style ancestor that needs to be broken down at startNode
+                 * and endNode.
+                 */
+                function breakNodes()
+                {
+                        var startPath = new CKEDITOR.dom.elementPath( startNode.getParent() ),
+                                endPath = endNode && new CKEDITOR.dom.elementPath( endNode.getParent() ),
+                                breakStart = null,
+                                breakEnd = null;
+                        for ( var i = 0 ; i < startPath.elements.length ; i++ )
+                        {
+                                var element = startPath.elements[ i ];
+
+                                if ( element == startPath.block || element == startPath.blockLimit )
+                                        break;
+
+                                if ( me.checkElementRemovable( element ) )
+                                        breakStart = element;
+                        }
+                        for ( i = 0 ; endPath && i < endPath.elements.length ; i++ )
+                        {
+                                element = endPath.elements[ i ];
+
+                                if ( element == endPath.block || element == endPath.blockLimit )
+                                        break;
+
+                                if ( me.checkElementRemovable( element ) )
+                                        breakEnd = element;
+                        }
+
+                        if ( breakEnd )
+                                endNode.breakParent( breakEnd );
+                        if ( breakStart )
+                                startNode.breakParent( breakStart );
+                }
+
                 if ( range.collapsed )
                 {
 
@@ -688 +727 @@
                                                 boundaryElement = element;
                                                 boundaryElement.match = isStart ? 'start' : 'end';
                                         }
+                                        // If presents collapsed range will split the current style element but not remove the whole element.
+                                        else if ( this._.definition.splitOnRemove )
+                                                breakNodes();
                                         else
                                         {
                                                 /*
@@ -734 +776 @@
                          * Now our range isn't collapsed. Lets walk from the start node to the end
                          * node via DFS and remove the styles one-by-one.
                          */
-                        var endNode = bookmark.endNode,
-                                me = this;
-
-                        /*
-                         * Find out the style ancestor that needs to be broken down at startNode
-                         * and endNode.
-                         */
-                        function breakNodes()
-                        {
-                                var startPath = new CKEDITOR.dom.elementPath( startNode.getParent() ),
-                                        endPath = new CKEDITOR.dom.elementPath( endNode.getParent() ),
-                                        breakStart = null,
-                                        breakEnd = null;
-                                for ( var i = 0 ; i < startPath.elements.length ; i++ )
-                                {
-                                        var element = startPath.elements[ i ];
-
-                                        if ( element == startPath.block || element == startPath.blockLimit )
-                                                break;
-
-                                        if ( me.checkElementRemovable( element ) )
-                                                breakStart = element;
-                                }
-                                for ( i = 0 ; i < endPath.elements.length ; i++ )
-                                {
-                                        element = endPath.elements[ i ];
-
-                                        if ( element == endPath.block || element == endPath.blockLimit )
-                                                break;
-
-                                        if ( me.checkElementRemovable( element ) )
-                                                breakEnd = element;
-                                }
-
-                                if ( breakEnd )
-                                        endNode.breakParent( breakEnd );
-                                if ( breakStart )
-                                        startNode.breakParent( breakStart );
-                        }
                         breakNodes();
 
                         // Now, do the DFS walk.

_source/plugins/font/plugin.js

@@ -70 +70 @@
                                         if ( this.getValue() == value )
                                                 style.remove( editor.document );
                                         else
+                                        {
+                                                // Clean up any conflicting style within the range.
+                                                new CKEDITOR.style( CKEDITOR.tools.extend( config[ 'fontSize_style' ], { splitOnRemove : 1 } ) , { 'size' : 'inherit' } ).remove( editor.document );
                                                 style.apply( editor.document );
+                                        }
 
                                         editor.fire( 'saveSnapshot' );
                                 },