Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.0.1
[ckeditor.git]
/
_source
/
plugins
/
styles
/
plugin.js
diff --git
a/_source/plugins/styles/plugin.js
b/_source/plugins/styles/plugin.js
index
1d468ad
..
2e82127
100644
(file)
--- a/
_source/plugins/styles/plugin.js
+++ b/
_source/plugins/styles/plugin.js
@@
-267,7
+267,7
@@
CKEDITOR.STYLE_OBJECT = 3;
stylesText = stylesText.replace( semicolonFixRegex, ';' );
\r
\r
for ( var style in stylesDef )
\r
stylesText = stylesText.replace( semicolonFixRegex, ';' );
\r
\r
for ( var style in stylesDef )
\r
- stylesText += style + ':' + stylesDef[ style ] + ';';
\r
+ stylesText += ( style + ':' + stylesDef[ style ] ).replace( semicolonFixRegex, ';' );
\r
\r
// Browsers make some changes to the style when applying them. So, here
\r
// we normalize it to the browser format.
\r
\r
// Browsers make some changes to the style when applying them. So, here
\r
// we normalize it to the browser format.
\r
@@
-1200,6
+1200,7
@@
CKEDITOR.STYLE_OBJECT = 3;
// Compensate tail semi-colon.
\r
return styleText.replace( /\s*([;:])\s*/, '$1' )
\r
.replace( /([^\s;])$/, '$1;')
\r
// Compensate tail semi-colon.
\r
return styleText.replace( /\s*([;:])\s*/, '$1' )
\r
.replace( /([^\s;])$/, '$1;')
\r
+ .replace( /,\s+/g, ',' ) // Trimming spaces after comma (e.g. font-family name)(#4107).
\r
.toLowerCase();
\r
}
\r
\r
.toLowerCase();
\r
}
\r
\r