Ticket #8979: 8979_3.patch

_source/plugins/font/plugin.js

@@ -93 +93 @@
                                                                 // the styles.
                                                                 for ( var value in styles )
                                                                 {
-                                                                        if ( styles[ value ].checkElementRemovable( element, true ) )
+                                                                        if ( styles[ value ].checkElementMatch( element, true ) )
                                                                         {
                                                                                 if ( value != currentValue )
                                                                                         this.setValue( value );

_source/plugins/styles/plugin.js

@@ -218 +218 @@
                         return true;
                 },
 
-                // Checks if an element, or any of its attributes, is removable by the
-                // current style definition.
-                checkElementRemovable : function( element, fullMatch )
+                // Check if the element matches the current style definition.
+                checkElementMatch : function( element, fullMatch )
                 {
                         var def = this._.definition;
 
@@ -266 +265 @@
                                         return true;
                         }
 
-                        // Check if the element can be somehow overriden.
+                        return false;
+                },
+
+                // Checks if an element, or any of its attributes, is removable by the
+                // current style definition.
+                checkElementRemovable : function( element, fullMatch )
+                {
+                        // Check element matches the style itself.
+                        if ( this.checkElementMatch( element, fullMatch ) )
+                                return true;
+
+                        // Check if the element matches the style overrides.
                         var override = getOverrides( this )[ element.getName() ] ;
                         if ( override )
                         {