Ticket #5931: 5931_2.patch

_source/plugins/styles/plugin.js

@@ -481 +481 @@
                                 // Get the element that holds the entire range.
                                 var parent = styleRange.getCommonAncestor();
 
+                                var removeList = {
+                                        styles : {},
+                                        attrs : {}
+                                };
+
+                                var attName, styleName;
+
                                 // 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 );
+                                                                removeList.attrs[ attName ] = 1;
+                                                        else
+                                                                delete removeList.attrs[ attName ];
                                                 }
 
-                                                for ( var styleName in def.styles )
+                                                for ( styleName in def.styles )
                                                 {
                                                         if ( styleNode.getStyle( styleName ) == parent.getStyle( styleName ) )
-                                                                styleNode.removeStyle( styleName );
+                                                                removeList.attrs[ attName ] = 1;
+                                                        else
+                                                                delete removeList.attrs[ attName ];
                                                 }
+                                        }
 
-                                                if ( !styleNode.hasAttributes() )
-                                                {
-                                                        styleNode = null;
-                                                        break;
-                                                }
-                                        }
+                                        parent = parent.getParent();
+                                }
+
+                                for ( attName in removeList.attrs )
+                                {
+                                        // Skip prototype extensions.
+                                        if ( !removeList.attrs.hasOwnProperty( attName ) )
+                                                continue;
+                                        styleNode.removeAttribute( attName );
+                                }
 
-                                        parent = parent.getParent();
+                                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.