From 84050a250fa529cd0ed53397dcdbb586cbc1e448 Mon Sep 17 00:00:00 2001 From: Rob Veldpaus Date: Thu, 31 Oct 2013 13:18:14 -0400 Subject: [PATCH 1/3] Changed the default configuration value for contentCss to use CKEDITOR.getUrl. This ensures that if you override the getUrl using window.CKEDITOR_GETURL that you don't have to specify a location for the default content configuration. --- plugins/wysiwygarea/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/wysiwygarea/plugin.js b/plugins/wysiwygarea/plugin.js index 3c741534d97..1c598ca2085 100644 --- a/plugins/wysiwygarea/plugin.js +++ b/plugins/wysiwygarea/plugin.js @@ -611,7 +611,7 @@ CKEDITOR.config.disableNativeSpellChecker = true; * @cfg {String/Array} [contentsCss=CKEDITOR.basePath + 'contents.css'] * @member CKEDITOR.config */ -CKEDITOR.config.contentsCss = CKEDITOR.basePath + 'contents.css'; +CKEDITOR.config.contentsCss = CKEDITOR.getUrl( 'contents.css' ); /** * Language code of the writting language which is used to author the editor From e1dea2e69d08339d28cda5bf0f0ccf1e144ffa6a Mon Sep 17 00:00:00 2001 From: Rob Veldpaus Date: Thu, 31 Oct 2013 13:21:27 -0400 Subject: [PATCH 2/3] Updated the documentation to go with the line changed. --- plugins/wysiwygarea/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/wysiwygarea/plugin.js b/plugins/wysiwygarea/plugin.js index 1c598ca2085..93d25502484 100644 --- a/plugins/wysiwygarea/plugin.js +++ b/plugins/wysiwygarea/plugin.js @@ -608,7 +608,7 @@ CKEDITOR.config.disableNativeSpellChecker = true; * config.contentsCss = '/css/mysitestyles.css'; * config.contentsCss = ['/css/mysitestyles.css', '/css/anotherfile.css']; * - * @cfg {String/Array} [contentsCss=CKEDITOR.basePath + 'contents.css'] + * @cfg {String/Array} [contentsCss=CKEDITOR.getUrl( 'contents.css' )] * @member CKEDITOR.config */ CKEDITOR.config.contentsCss = CKEDITOR.getUrl( 'contents.css' ); From e04e23136845556674f3b06d66ddf843394054b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Mon, 30 Dec 2013 11:09:40 +0100 Subject: [PATCH 3/3] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 56903a5afe6..4e32b4789e3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ CKEditor 4 Changelog ## CKEditor 4.3.2 +* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl). * [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables. * [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in `sourcedialog` plugin.