Ticket #3611: 3611.patch

_source/plugins/styles/plugin.js

@@ -81 +81 @@
         var objectElements      = { a:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,ul:1 };
 
         var semicolonFixRegex = /\s*(?:;\s*|$)/;
+        var removeValueRegex = /([^:]+:)([^;]+);/g;
 
         CKEDITOR.style = function( styleDefinition, variablesValues )
         {
@@ -197 +198 @@
                                         {
                                                 if ( attName == '_length' )
                                                         continue;
-                                                if ( attribs[attName] == element.getAttribute( attName ) )
+                                                var testAttrib = attribs[ attName ];
+                                                var elementAttrib = element.getAttribute( attName );
+
+                                                // If ignoring the values, simply remove them so that they're not compared.
+                                                if ( def.ignore_values )
                                                 {
+                                                        testAttrib = testAttrib.replace( removeValueRegex, '\1;' );
+                                                        elementAttrib = elementAttrib.replace( removeValueRegex, '\1;' );
+                                                }
+                                                
+                                                if ( testAttrib == elementAttrib )
+                                                {
                                                         if ( !fullMatch )
                                                                 return true;
                                                 }

_source/plugins/colorbutton/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -148 +148 @@
         {
                 element         : 'span',
                 styles          : { 'color' : '#(color)' },
-                overrides       : [ { element : 'font', attributes : { 'color' : null } } ]
+                overrides       : [ { element : 'font', attributes : { 'color' : null } } ],
+                ignore_values : true
         };
 
 CKEDITOR.config.colorButton_backStyle =
         {
                 element         : 'span',
-                styles          : { 'background-color' : '#(color)' }
+                styles          : { 'background-color' : '#(color)' },
+                ignore_values : true
         };