Changeset 6817 for CKEditor/trunk

Timestamp:

04/29/11 16:09:25 (2 years ago)

Author:

garry.yao

Message:

#7322: Font-family style normalization to have better compatibility.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/styles/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -54 +54 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6109">#6109</a> : Paste and Paste as Plain Text dialog windows now use the standard <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.html#commitContent">commitContent</a></code> and <code><a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.html#setupContent">setupContent</a></code> methods.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7588">#7588</a> : The editor code now has a protection system to avoid issues when including ckeditor.js more than once in the page.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7322">#7322</a> : Text font plugin now recognizes font family names which contain quotations.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/styles/plugin.js

@@ -1446 +1446 @@
                 else
                         styleText = unparsedCssText;
+
+                // Normalize font-family property, ignore quotes and being case insensitive. (#7322)
+                // http://www.w3.org/TR/css3-fonts/#font-family-the-font-family-property
+                styleText = styleText.replace( /(font-family:)(.*?)(?=;|$)/, function ( match, prop, val )
+                {
+                        var names = val.split( ',' );
+                        for ( var i = 0; i < names.length; i++ )
+                                names[ i ] = CKEDITOR.tools.trim( names[ i ].replace( /["']/g, '' ) );
+                        return prop + names.join( ',' );
+                });
 
                 // Shrinking white-spaces around colon and semi-colon (#4147).