Ticket #4107: 4107.patch

_source/plugins/styles/plugin.js

@@ -197 +197 @@
                                         {
                                                 if ( attName == '_length' )
                                                         continue;
-                                                if ( attribs[attName] == element.getAttribute( attName ) )
+                                                if ( attribs[attName] == normalizeCssText( element.getAttribute( attName ), false ) )
                                                 {
                                                         if ( !fullMatch )
                                                                 return true;
@@ -1177 +1177 @@
                 return overrides;
         }
 
-        function normalizeCssText( unparsedCssText )
+        function normalizeCssText( unparsedCssText, nativeNormalize )
         {
-                // Injects the style in a temporary span object, so the browser parses it,
-                // retrieving its final format.
-                var temp = new CKEDITOR.dom.element( 'span' );
-                temp.setAttribute( 'style', unparsedCssText );
-                var styleText = temp.getAttribute( 'style' );
+                var styleText;
+                if ( nativeNormalize != false )
+                {
+                        // Injects the style in a temporary span object, so the browser parses it,
+                        // retrieving its final format.
+                        var temp = new CKEDITOR.dom.element( 'span' );
+                        temp.setAttribute( 'style', unparsedCssText );
+                        styleText = temp.getAttribute( 'style' );
+                }
+                else
+                        styleText = unparsedCssText;
+
+                // Normalize font-family style text across browsers.(#4107).
+                styleText = styleText.replace(/^font-family: ([\w -]+)((:?,\s+[\w -]+)*);/, function( match, g1, g2 )
+                {
+                        return 'font-family: ' + g1 +
+                                   ( g2 ? g2.replace( /,\s+([\w -]+)/g, function( match, g1 )
+                                   {
+                                                return ',' + g1;
+                                   } ) : '' ) +
+                                   ';';
+                } ).toLowerCase();
+
                 // IE will leave a single semicolon when failed to parse the style text.(#3891)
                 return styleText == ';' ? '' : styleText;
         }

CHANGES.html

@@ -185 +185 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4075">#4075</a> : [IE6/7]Fixed apply custom inline style with "class" attribute failed.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4087">#4087</a> : [Firefox]Fixed extra blocks created on create list when full document selected.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4107">#4107</a> : Fixed font style inconsistency across browsers.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>