Ticket #2768: 2768_4.patch

_source/plugins/styles/plugin.js

@@ -98 +98 @@
                 };
         };
 
+        var applyStyle = function( document, remove )
+        {
+                // Get all ranges from the selection.
+                var selection = document.getSelection();
+                var ranges = selection.getRanges();
+                var func = remove ? this.removeFromRange : this.applyToRange;
+
+                // Apply the style to the ranges.
+                for ( var i = 0 ; i < ranges.length ; i++ )
+                        func.call( this, ranges[ i ] );
+
+                // Select the ranges again.
+                selection.selectRanges( ranges );
+        };
+
         CKEDITOR.style.prototype =
         {
                 apply : function( document )
                 {
-                        // Get all ranges from the selection.
-                        var selection = document.getSelection();
-                        var ranges = selection.getRanges();
+                        applyStyle.call( this, document, false );
+                },
 
-                        // Apply the style to the ranges.
-                        for ( var i = 0 ; i < ranges.length ; i++ )
-                                this.applyToRange( ranges[ i ] );
-
-                        // Select the ranges again.
-                        selection.selectRanges( ranges );
+                remove : function( document )
+                {
+                        applyStyle.call( this, document, true );
                 },
 
                 applyToRange : function( range )
@@ -124 +135 @@
                                                 : null ).call( this, range );
                 },
 
+                removeFromRange : function( range )
+                {
+                        return ( this.removeFromRange = 
+                                                this.type == CKEDITOR.STYLE_INLINE ?
+                                                        removeInlineStyle
+                                                : null ).call( this, range );
+                },
+
                 /**
                  * Get the style state inside an element path. Returns "true" if the
                  * element is active in the path.
@@ -359 +378 @@
 
                                         // Here we do some cleanup, removing all duplicated
                                         // elements from the style element.
-                                        removeFromElement( this, styleNode );
+                                        removeFromInsideElement( this, styleNode );
 
                                         // Insert it into the range position (it is collapsed after
                                         // extractContents.
@@ -389 +408 @@
                 range.moveToBookmark( bookmark );
         };
 
-        var applyBlockStyle = function( range )
+        var removeInlineStyle = function( range )
         {
-        };
+                /*
+                 * Make sure our range has included all "collpased" parent inline nodes so
+                 * that our operation logic can be simpler.
+                 */
+                range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
 
-        // Removes a style from inside an element.
-        var removeFromElement = function( style, element )
-        {
-                var def = style._.definition;
-                var attribs = def.attributes;
-                var styles = def.styles;
+                var bookmark = range.createBookmark(),
+                        startNode = bookmark.startNode,
+                        startPath = new CKEDITOR.dom.elementPath( startNode.getParent() );
 
-                var innerElements = element.getElementsByTag( style.element );
+                if ( range.collapsed )
+                {
+                        /* 
+                         * If the range is collapsed, try to remove the style from all ancestor
+                         * elements, until either a block boundary is reached, or the style is
+                         * removed.
+                         */
+                        for ( var i = 0, element ; i < startPath.elements.length && ( element = startPath.elements[i] )  ; i++ )
+                        {
+                                if ( element == startPath.block || element == startPath.blockLimit )
+                                        break;
 
-                for ( var i = innerElements.count() ; --i >= 0 ; )
+                                if ( this.checkElementRemovable( element ) )
+                                {
+                                        removeFromElement( this, element );
+                                        break;
+                                }
+                        }
+                }
+                else
                 {
-                        var innerElement = innerElements.getItem( i );
+                        /*
+                         * 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,
+                                endPath = new CKEDITOR.dom.elementPath( endNode.getParent() );
+                                currentNode = startNode;
 
-                        for ( var attName in attribs )
+                        // Find out the ancestor that needs to be broken down at startNode and endNode.
+                        var breakStart = null, breakEnd = null;
+                        for ( var i = 0 ; i < startPath.elements.length ; i++ )
                         {
-                                // The 'class' element value must match (#1318).
-                                if ( attName == 'class' && innerElement.getAttribute( 'class' ) != attribs[ attName ] )
-                                        continue;
-
-                                innerElement.removeAttribute( attName );
+                                if ( this.checkElementRemovable( startPath.elements[ i ] ) )
+                                {
+                                        breakStart = startPath.elements[ i ];
+                                        break;
+                                }
                         }
+                        for ( var i = 0 ; i < endPath.elements.length ; i++ )
+                        {
+                                if ( this.checkElementRemovable( endPath.elements[ i ] ) )
+                                {
+                                        breakEnd = endPath.elements[ i ];
+                                        break;
+                                }
+                        }
 
-                        for ( var styleName in styles )
+                        if ( breakEnd )
+                                endNode.breakParent( breakEnd );
+                        if ( breakStart )
+                                startNode.breakParent( breakStart );
+
+                        // Now, do the DFS walk.
+                        while ( ( currentNode = currentNode.getNextSourceNode() ) && !currentNode.equals( endNode ) )
                         {
-                                innerElement.removeStyle( styleName );
+                                if ( currentNode.type == CKEDITOR.NODE_ELEMENT )
+                                        removeFromElement( this, currentNode );
                         }
+                }
+                
+                range.moveToBookmark( bookmark );
+        };
 
-                        removeNoAttribsElement( innerElement );
+        var applyBlockStyle = function( range )
+        {
+        };
+
+        // Removes a style from an element itself, don't care about its subtree.
+        var removeFromElement = function( style, element )
+        {
+                var def = style._.definition,
+                        attributes = def.attributes,
+                        styles = def.styles;
+
+                for ( var attName in attributes )
+                {
+                        // The 'class' element value must match (#1318).
+                        if ( attName == 'class' && element.getAttribute( attName ) != attributes[ attName ] )
+                                continue;
+                        element.removeAttribute( attName );
                 }
+
+                for ( var styleName in styles )
+                        element.removeStyle( styleName );
+
+                removeNoAttribsElement( element );
         };
 
+        // Removes a style from inside an element.
+        var removeFromInsideElement = function( style, element )
+        {
+                var def = style._.definition;
+                var attribs = def.attributes;
+                var styles = def.styles;
+
+                var innerElements = element.getElementsByTag( style.element );
+
+                for ( var i = innerElements.count() ; --i >= 0 ; )
+                        removeFromElement( style, innerElements.getItem( i ) );
+        };
+
         // If the element has no more attributes, remove it.
         var removeNoAttribsElement = function( element )
         {
@@ -596 +694 @@
         var doc = editor.document;
 
         if ( doc )
-                this.style.apply( doc );
+        {
+                if ( this.state == CKEDITOR.TRISTATE_OFF )
+                        this.style.apply( doc );
+                else if ( this.state == CKEDITOR.TRISTATE_ON )
+                        this.style.remove( doc );
+        }
 
         return !!doc;
 };