Ticket #5931: 5931_3.patch

_source/plugins/styles/plugin.js

@@ -479 +479 @@
                         {
                                 // Build the style element, based on the style object definition.
                                 var styleNode = getElement( this, document );
-
                                 // Get the element that holds the entire range.
                                 var parent = styleRange.getCommonAncestor();
 
+                                var styleRange2 = styleRange.clone();
+                                styleRange2.shrink();
+                                var innerStyle = styleRange2.getCommonAncestor();
+                                
+                                if ( innerStyle.$ != parent.$ )
+                                {
+                                        for ( attName in def.attributes )
+                                        {
+                                                if ( innerStyle.hasAttribute( attName ) )
+                                                        innerStyle.removeAttribute( attName );
+                                        }
+
+                                        for ( styleName in def.styles )
+                                        {
+                                                if ( innerStyle.getStyle( styleName ) )
+                                                        innerStyle.removeStyle( styleName );
+                                        }
+
+                                        if ( !innerStyle.getAttribute( 'style' ) )
+                                                innerStyle.removeAttribute( 'style' );
+                                        
+                                        if ( !innerStyle.hasAttributes() )
+                                        {
+                                                var target = innerStyle.getParent();
+                                                var child;
+                                                while ( child = innerStyle.$.lastChild )
+                                                        target.$.insertBefore( innerStyle.$.removeChild( child ), innerStyle.$.nextSibling );
+                                                innerStyle.remove();
+                                        }
+                                }                               
+
+                                var removeList = {
+                                        styles : {},
+                                        attrs : {},
+                                        // Styles cannot be removed.
+                                        blockedStyles : {},
+                                        // Attrs cannot be removed.
+                                        blockedAttrs : {}
+                                };
+
+                                var attName, styleName, value;
+
                                 // Loop through the parents, removing the redundant attributes
                                 // from the element to be applied.
                                 while ( styleNode && parent )
                                 {
                                         if ( parent.getName() == elementName )
                                         {
-                                                for ( var attName in def.attributes )
+                                                for ( attName in def.attributes )
                                                 {
-                                                        if ( styleNode.getAttribute( attName ) == parent.getAttribute( attName ) )
-                                                                styleNode.removeAttribute( attName );
-                                                }
+                                                        if ( removeList.blockedAttrs[ attName ] || !( value = parent.getAttribute( styleName ) ) )
+                                                                continue;
 
-                                                for ( var styleName in def.styles )
-                                                {
-                                                        if ( styleNode.getStyle( styleName ) == parent.getStyle( styleName ) )
-                                                                styleNode.removeStyle( styleName );
+                                                        if ( styleNode.getAttribute( attName ) == value )
+                                                                removeList.attrs[ attName ] = 1;
+                                                        else
+                                                                removeList.blockedAttrs[ attName ] = 1;
                                                 }
 
-                                                if ( !styleNode.hasAttributes() )
+                                                for ( styleName in def.styles )
                                                 {
-                                                        styleNode = null;
-                                                        break;
+                                                        if ( removeList.blockedStyles[ styleName ] || !( value = parent.getStyle( styleName ) ) )
+                                                                continue;
+
+                                                        if ( styleNode.getStyle( styleName ) == value )
+                                                                removeList.styles[ styleName ] = 1;
+                                                        else
+                                                                removeList.blockedStyles[ styleName ] = 1;
                                                 }
                                         }
 
                                         parent = parent.getParent();
                                 }
 
+                                for ( attName in removeList.attrs )
+                                {
+                                        // Skip prototype extensions.
+                                        if ( !removeList.attrs.hasOwnProperty( attName ) )
+                                                continue;
+                                        styleNode.removeAttribute( attName );
+                                }
+
+                                for ( styleName in removeList.styles )
+                                {
+                                        // Skip prototype extensions.
+                                        if ( !removeList.styles.hasOwnProperty( styleName ) )
+                                                continue;
+                                        styleNode.removeStyle( styleName );
+                                }
+
+                                if ( !styleNode.hasAttributes() )
+                                        styleNode = null;
+
                                 if ( styleNode )
                                 {
                                         // Move the contents of the range to the style element.