Ticket #5018: 5018_4.patch

_source/plugins/styles/plugin.js

@@ -937 +937 @@
                 for ( var attName in attributes )
                 {
                         // The 'class' element value must match (#1318).
-                        if ( attName == 'class' && element.getAttribute( attName ) != attributes[ attName ] )
+                        if ( ( attName == 'class' || style._.definition.fullMatch )
+                                && element.getAttribute( attName ) != normalizeProperty( attName, attributes[ attName ] ) )
                                 continue;
                         removeEmpty = element.hasAttribute( attName );
                         element.removeAttribute( attName );
@@ -945 +946 @@
 
                 for ( var styleName in styles )
                 {
+                        // Full match style insist on having fully equivalence. (#5018)
+                        if ( style._.definition.fullMatch
+                                && element.getStyle( styleName ) != normalizeProperty( styleName, styles[ styleName ], true ) )
+                                continue;
+
                         removeEmpty = removeEmpty || !!element.getStyle( styleName );
                         element.removeStyle( styleName );
                 }
@@ -1209 +1215 @@
                 return overrides;
         }
 
+        function normalizeProperty( name, value, isStyle )
+        {
+                var temp = new CKEDITOR.dom.element( 'span' );
+                temp [ isStyle ? 'setStyle' : 'setAttribute' ]( name, value );
+                return temp[ isStyle ? 'getStyle' : 'getAttribute' ]( name );
+        }
+        
         function normalizeCssText( unparsedCssText, nativeNormalize )
         {
                 var styleText;

_source/plugins/find/dialogs/find.js

@@ -67 +67 @@
 
         var findDialog = function( editor, startupPage )
         {
-                // Style object for highlights.
-                var highlightStyle = new CKEDITOR.style( editor.config.find_highlight );
+                // Style object for highlights: (#5018)
+                // 1. Defined as full match style to avoid compromising ordinary text color styles.
+                // 2. Must be apply onto inner-most text to avoid conflicting with ordinary text color styles visually.
+                var highlightStyle = new CKEDITOR.style( CKEDITOR.tools.extend( { fullMatch : true, childRule : function(){ return false; } },
+                        editor.config.find_highlight ) );
 
                 /**
                  * Iterator which walk through the specified range char by char. By