Index: /CKEditor/trunk/CHANGES.html =================================================================== --- /CKEditor/trunk/CHANGES.html (revision 4362) +++ /CKEditor/trunk/CHANGES.html (revision 4363) @@ -41,4 +41,5 @@

Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 4362) +++ /CKEditor/trunk/_source/core/config.js (revision 4363) @@ -64,11 +64,12 @@ /** - * The CSS file to be used to apply style to the contents. It should + * The CSS file(s) to be used to apply style to the contents. It should * reflect the CSS used in the final pages where the contents are to be * used. - * @type String + * @type String|Array * @default '<CKEditor folder>/contents.css' * @example * config.contentsCss = '/css/mysitestyles.css'; + * config.contentsCss = ['/css/mysitestyles.css', '/css/anotherfile.css']; */ contentsCss : CKEDITOR.basePath + 'contents.css', Index: /CKEditor/trunk/_source/plugins/font/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/font/plugin.js (revision 4362) +++ /CKEditor/trunk/_source/plugins/font/plugin.js (revision 4363) @@ -37,5 +37,5 @@ panel : { - css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ], + css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/format/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/format/plugin.js (revision 4362) +++ /CKEditor/trunk/_source/plugins/format/plugin.js (revision 4363) @@ -34,5 +34,5 @@ panel : { - css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ], + css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/preview/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 4362) +++ /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 4363) @@ -38,5 +38,7 @@ baseTag + '' + editor.lang.preview + '' + - '' + + '' + '' + bodyHtml + editor.getData() + Index: /CKEditor/trunk/_source/plugins/stylescombo/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 4362) +++ /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 4363) @@ -27,5 +27,5 @@ panel : { - css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ], + css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 4362) +++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 4363) @@ -561,5 +561,7 @@ '' + '' + - '' + + '' + '