Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 6816)
+++ /CKEditor/trunk/CHANGES.html (revision 6817)
@@ -54,4 +54,5 @@
#6109 : Paste and Paste as Plain Text dialog windows now use the standard commitContent
and setupContent
methods.
#7588 : The editor code now has a protection system to avoid issues when including ckeditor.js more than once in the page.
+ #7322 : Text font plugin now recognizes font family names which contain quotations.
Index: /CKEditor/trunk/_source/plugins/styles/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6816)
+++ /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6817)
@@ -1446,4 +1446,14 @@
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).