Ticket #8979: 8979.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.checkElementRemovable( element, true ) == 1 )
                                                                         {
                                                                                 if ( value != currentValue )
                                                                                         this.setValue( value );

_source/plugins/styles/plugin.js

@@ -235 +235 @@
                         {
                                 // If no attributes are defined in the element.
                                 if ( !fullMatch && !element.hasAttributes() )
-                                        return true;
+                                        return 1;
 
                                 attribs = getAttributesForComparison( def );
 
@@ -254 +254 @@
                                                         : attribs[ attName ] == elementAttr  )
                                                 {
                                                         if ( !fullMatch )
-                                                                return true;
+                                                                return 1;
                                                 }
                                                 else if ( fullMatch )
                                                                 return false;
                                         }
                                         if ( fullMatch )
-                                                return true;
+                                                return 1;
                                 }
                                 else
-                                        return true;
+                                        return 1;
                         }
 
                         // Check if the element can be somehow overriden.
@@ -272 +272 @@
                         {
                                 // If no attributes have been defined, remove the element.
                                 if ( !( attribs = override.attributes ) )
-                                        return true;
+                                        return 2;
 
                                 for ( var i = 0 ; i < attribs.length ; i++ )
                                 {
@@ -291 +291 @@
                                                 if ( attValue === null ||
                                                                 ( typeof attValue == 'string' && actualAttrValue == attValue ) ||
                                                                 attValue.test( actualAttrValue ) )
-                                                        return true;
+                                                        return 2;
                                         }
                                 }
                         }