Ticket #8979: 8979_2.patch

_source/plugins/font/plugin.js

@@ -82 +82 @@
                                                         var currentValue = this.getValue();
 
                                                         var elementPath = ev.data.path,
-                                                                elements = elementPath.elements;
+                                                                elements = elementPath.elements,
+                                                                style;
 
                                                         // For each element into the elements path.
                                                         for ( var i = 0, element ; i < elements.length ; i++ )
@@ -93 +94 @@
                                                                 // the styles.
                                                                 for ( var value in styles )
                                                                 {
-                                                                        if ( styles[ value ].checkElementRemovable( element, true ) )
+                                                                        style = styles[ value ];
+
+                                                                        // Check if element style matches precisely.
+                                                                        if ( style.checkElementMatch( element, true ) )
                                                                         {
                                                                                 if ( value != currentValue )
                                                                                         this.setValue( value );
@@ -230 +234 @@
         {
                 element         : 'span',
                 styles          : { 'font-size' : '#(size)' },
-                overrides       : [ { element : 'font', attributes : { 'size' : null } } ]
+                overrides       : [ { element : 'font', styles  : { 'font-size' : '#(size)' } } ]
         };

_source/plugins/styles/plugin.js

@@ -222 +222 @@
                 // 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 )
+                        {
+                                // If no attributes have been defined, remove the element.
+                                if ( !( attribs = override.attributes ) )
+                                        return true;
+
+                                for ( var i = 0 ; i < attribs.length ; i++ )
+                                {
+                                        attName = attribs[i][0];
+                                        var actualAttrValue = element.getAttribute( attName );
+                                        if ( actualAttrValue )
+                                        {
+                                                var attValue = attribs[i][1];
+
+                                                // Remove the attribute if:
+                                                //    - The override definition value is null;
+                                                //    - The override definition value is a string that
+                                                //      matches the attribute value exactly.
+                                                //    - The override definition value is a regex that
+                                                //      has matches in the attribute value.
+                                                if ( attValue === null ||
+                                                                ( typeof attValue == 'string' && actualAttrValue == attValue ) ||
+                                                                attValue.test( actualAttrValue ) )
+                                                        return true;
+                                        }
+                                }
+                        }
+                        return false;
+                },
+
+                // Check if the element matches the current style definition.
+                checkElementMatch : function( element, fullMatch )
+                {
                         var def = this._.definition;
 
                         if ( !element || !def.ignoreReadonly && element.isReadOnly() )
@@ -266 +305 @@
                                         return true;
                         }
 
-                        // Check if the element can be somehow overriden.
-                        var override = getOverrides( this )[ element.getName() ] ;
-                        if ( override )
-                        {
-                                // If no attributes have been defined, remove the element.
-                                if ( !( attribs = override.attributes ) )
-                                        return true;
-
-                                for ( var i = 0 ; i < attribs.length ; i++ )
-                                {
-                                        attName = attribs[i][0];
-                                        var actualAttrValue = element.getAttribute( attName );
-                                        if ( actualAttrValue )
-                                        {
-                                                var attValue = attribs[i][1];
-
-                                                // Remove the attribute if:
-                                                //    - The override definition value is null;
-                                                //    - The override definition value is a string that
-                                                //      matches the attribute value exactly.
-                                                //    - The override definition value is a regex that
-                                                //      has matches in the attribute value.
-                                                if ( attValue === null ||
-                                                                ( typeof attValue == 'string' && actualAttrValue == attValue ) ||
-                                                                attValue.test( actualAttrValue ) )
-                                                        return true;
-                                        }
-                                }
-                        }
                         return false;
                 },