From ea6a849862683131009d564c62c875e4143d78d5 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 22 Jun 2016 18:56:26 +0200 Subject: [PATCH 1/6] upgrade to CKEditor 4.5.9 --- www/script/editor/changelog.txt | 9 + www/script/editor/ckeditor/CHANGES.md | 15 + www/script/editor/ckeditor/adapters/jquery.js | 10 + www/script/editor/ckeditor/build-config.js | 4 +- www/script/editor/ckeditor/ckeditor.js | 1060 +++++------ www/script/editor/ckeditor/lang/af.js | 2 +- www/script/editor/ckeditor/lang/ar.js | 2 +- www/script/editor/ckeditor/lang/bg.js | 2 +- www/script/editor/ckeditor/lang/bn.js | 2 +- www/script/editor/ckeditor/lang/bs.js | 2 +- www/script/editor/ckeditor/lang/ca.js | 2 +- www/script/editor/ckeditor/lang/cs.js | 2 +- www/script/editor/ckeditor/lang/cy.js | 2 +- www/script/editor/ckeditor/lang/da.js | 2 +- www/script/editor/ckeditor/lang/de-ch.js | 2 +- www/script/editor/ckeditor/lang/de.js | 2 +- www/script/editor/ckeditor/lang/el.js | 2 +- www/script/editor/ckeditor/lang/en-au.js | 2 +- www/script/editor/ckeditor/lang/en-ca.js | 2 +- www/script/editor/ckeditor/lang/en-gb.js | 2 +- www/script/editor/ckeditor/lang/en.js | 2 +- www/script/editor/ckeditor/lang/eo.js | 2 +- www/script/editor/ckeditor/lang/es.js | 2 +- www/script/editor/ckeditor/lang/et.js | 2 +- www/script/editor/ckeditor/lang/eu.js | 2 +- www/script/editor/ckeditor/lang/fa.js | 2 +- www/script/editor/ckeditor/lang/fi.js | 2 +- www/script/editor/ckeditor/lang/fo.js | 2 +- www/script/editor/ckeditor/lang/fr-ca.js | 2 +- www/script/editor/ckeditor/lang/fr.js | 2 +- www/script/editor/ckeditor/lang/gl.js | 2 +- www/script/editor/ckeditor/lang/gu.js | 2 +- www/script/editor/ckeditor/lang/he.js | 2 +- www/script/editor/ckeditor/lang/hi.js | 2 +- www/script/editor/ckeditor/lang/hr.js | 2 +- www/script/editor/ckeditor/lang/hu.js | 2 +- www/script/editor/ckeditor/lang/id.js | 2 +- www/script/editor/ckeditor/lang/is.js | 2 +- www/script/editor/ckeditor/lang/it.js | 2 +- www/script/editor/ckeditor/lang/ja.js | 2 +- www/script/editor/ckeditor/lang/ka.js | 2 +- www/script/editor/ckeditor/lang/km.js | 2 +- www/script/editor/ckeditor/lang/ko.js | 2 +- www/script/editor/ckeditor/lang/ku.js | 2 +- www/script/editor/ckeditor/lang/lt.js | 2 +- www/script/editor/ckeditor/lang/lv.js | 2 +- www/script/editor/ckeditor/lang/mk.js | 2 +- www/script/editor/ckeditor/lang/mn.js | 2 +- www/script/editor/ckeditor/lang/ms.js | 2 +- www/script/editor/ckeditor/lang/nb.js | 2 +- www/script/editor/ckeditor/lang/nl.js | 2 +- www/script/editor/ckeditor/lang/no.js | 2 +- www/script/editor/ckeditor/lang/pl.js | 2 +- www/script/editor/ckeditor/lang/pt-br.js | 2 +- www/script/editor/ckeditor/lang/pt.js | 2 +- www/script/editor/ckeditor/lang/ro.js | 2 +- www/script/editor/ckeditor/lang/ru.js | 2 +- www/script/editor/ckeditor/lang/si.js | 2 +- www/script/editor/ckeditor/lang/sk.js | 2 +- www/script/editor/ckeditor/lang/sl.js | 2 +- www/script/editor/ckeditor/lang/sq.js | 2 +- www/script/editor/ckeditor/lang/sr-latn.js | 2 +- www/script/editor/ckeditor/lang/sr.js | 2 +- www/script/editor/ckeditor/lang/sv.js | 2 +- www/script/editor/ckeditor/lang/th.js | 2 +- www/script/editor/ckeditor/lang/tr.js | 2 +- www/script/editor/ckeditor/lang/tt.js | 2 +- www/script/editor/ckeditor/lang/ug.js | 2 +- www/script/editor/ckeditor/lang/uk.js | 2 +- www/script/editor/ckeditor/lang/vi.js | 2 +- www/script/editor/ckeditor/lang/zh-cn.js | 2 +- www/script/editor/ckeditor/lang/zh.js | 2 +- .../editor/ckeditor/plugins/btgrid/.gitignore | 1 + .../editor/ckeditor/plugins/btgrid/README.md | 2 + .../editor/ckeditor/plugins/btgrid/bower.json | 32 + .../colordialog/dialogs/colordialog.css | 20 + .../colordialog/dialogs/colordialog.js | 19 +- .../ckeditor/plugins/find/dialogs/find.js | 21 +- www/script/editor/ckeditor/plugins/icons.png | Bin 23592 -> 23681 bytes .../editor/ckeditor/plugins/icons_hidpi.png | Bin 68262 -> 68198 bytes .../editor/ckeditor/samples/css/samples.css | 1640 +++++++++++++++++ .../ckeditor/samples/img/github-top.png | Bin 0 -> 383 bytes .../editor/ckeditor/samples/img/header-bg.png | Bin 0 -> 13086 bytes .../ckeditor/samples/img/header-separator.png | Bin 0 -> 123 bytes .../editor/ckeditor/samples/img/logo.png | Bin 0 -> 5891 bytes .../ckeditor/samples/img/navigation-tip.png | Bin 0 -> 12029 bytes www/script/editor/ckeditor/samples/index.html | 128 ++ .../editor/ckeditor/samples/js/sample.js | 53 + www/script/editor/ckeditor/samples/js/sf.js | 17 + .../editor/ckeditor/samples/old/ajax.html | 85 + .../editor/ckeditor/samples/old/api.html | 210 +++ .../editor/ckeditor/samples/old/appendto.html | 59 + .../samples/old/assets/inlineall/logo.png | Bin 0 -> 4283 bytes .../old/assets/outputxhtml/outputxhtml.css | 204 ++ .../samples/old/assets/posteddata.php | 59 + .../ckeditor/samples/old/assets/sample.jpg | Bin 0 -> 14449 bytes .../old/assets/uilanguages/languages.js | 7 + .../ckeditor/samples/old/datafiltering.html | 508 +++++ .../samples/old/dialog/assets/my_dialog.js | 48 + .../ckeditor/samples/old/dialog/dialog.html | 190 ++ .../ckeditor/samples/old/divreplace.html | 144 ++ .../samples/old/enterkey/enterkey.html | 106 ++ .../assets/outputforflash/outputforflash.fla | Bin 0 -> 85504 bytes .../assets/outputforflash/outputforflash.swf | Bin 0 -> 15571 bytes .../assets/outputforflash/swfobject.js | 19 + .../old/htmlwriter/outputforflash.html | 283 +++ .../samples/old/htmlwriter/outputhtml.html | 224 +++ .../editor/ckeditor/samples/old/index.html | 131 ++ .../ckeditor/samples/old/inlineall.html | 314 ++++ .../ckeditor/samples/old/inlinebycode.html | 124 ++ .../ckeditor/samples/old/inlinetextarea.html | 113 ++ .../editor/ckeditor/samples/old/jquery.html | 103 ++ .../samples/old/magicline/magicline.html | 209 +++ .../editor/ckeditor/samples/old/readonly.html | 76 + .../ckeditor/samples/old/replacebyclass.html | 60 + .../ckeditor/samples/old/replacebycode.html | 59 + .../editor/ckeditor/samples/old/sample.css | 357 ++++ .../editor/ckeditor/samples/old/sample.js | 50 + .../samples/old/sample_posteddata.php | 16 + .../editor/ckeditor/samples/old/tabindex.html | 78 + .../ckeditor/samples/old/toolbar/toolbar.html | 235 +++ .../editor/ckeditor/samples/old/uicolor.html | 72 + .../ckeditor/samples/old/uilanguages.html | 122 ++ .../samples/old/wysiwygarea/fullpage.html | 80 + .../ckeditor/samples/old/xhtmlstyle.html | 234 +++ .../toolbarconfigurator/css/fontello.css | 55 + .../toolbarconfigurator/font/LICENSE.txt | 10 + .../toolbarconfigurator/font/config.json | 28 + .../toolbarconfigurator/font/fontello.eot | Bin 0 -> 4988 bytes .../toolbarconfigurator/font/fontello.svg | 14 + .../toolbarconfigurator/font/fontello.ttf | Bin 0 -> 4820 bytes .../toolbarconfigurator/font/fontello.woff | Bin 0 -> 2904 bytes .../samples/toolbarconfigurator/index.html | 446 +++++ .../js/abstracttoolbarmodifier.js | 13 + .../js/fulltoolbareditor.js | 9 + .../toolbarconfigurator/js/toolbarmodifier.js | 33 + .../js/toolbartextmodifier.js | 14 + .../lib/codemirror/LICENSE | 19 + .../lib/codemirror/codemirror.css | 325 ++++ .../lib/codemirror/codemirror.js | 288 +++ .../lib/codemirror/javascript.js | 25 + .../lib/codemirror/neo.css | 36 + .../lib/codemirror/show-hint.css | 38 + .../lib/codemirror/show-hint.js | 16 + .../editor/ckeditor/skins/moono/dialog.css | 2 +- .../editor/ckeditor/skins/moono/dialog_ie.css | 2 +- .../ckeditor/skins/moono/dialog_ie7.css | 2 +- .../ckeditor/skins/moono/dialog_ie8.css | 2 +- .../ckeditor/skins/moono/dialog_iequirks.css | 2 +- .../editor/ckeditor/skins/moono/editor.css | 2 +- .../ckeditor/skins/moono/editor_gecko.css | 2 +- .../editor/ckeditor/skins/moono/editor_ie.css | 2 +- .../ckeditor/skins/moono/editor_ie7.css | 2 +- .../ckeditor/skins/moono/editor_ie8.css | 2 +- .../ckeditor/skins/moono/editor_iequirks.css | 2 +- .../editor/ckeditor/skins/moono/icons.png | Bin 23592 -> 23681 bytes .../ckeditor/skins/moono/icons_hidpi.png | Bin 68262 -> 68198 bytes 157 files changed, 8506 insertions(+), 629 deletions(-) create mode 100644 www/script/editor/ckeditor/adapters/jquery.js create mode 100644 www/script/editor/ckeditor/plugins/btgrid/.gitignore create mode 100644 www/script/editor/ckeditor/plugins/btgrid/bower.json create mode 100644 www/script/editor/ckeditor/plugins/colordialog/dialogs/colordialog.css create mode 100644 www/script/editor/ckeditor/samples/css/samples.css create mode 100644 www/script/editor/ckeditor/samples/img/github-top.png create mode 100644 www/script/editor/ckeditor/samples/img/header-bg.png create mode 100644 www/script/editor/ckeditor/samples/img/header-separator.png create mode 100644 www/script/editor/ckeditor/samples/img/logo.png create mode 100644 www/script/editor/ckeditor/samples/img/navigation-tip.png create mode 100644 www/script/editor/ckeditor/samples/index.html create mode 100644 www/script/editor/ckeditor/samples/js/sample.js create mode 100644 www/script/editor/ckeditor/samples/js/sf.js create mode 100644 www/script/editor/ckeditor/samples/old/ajax.html create mode 100644 www/script/editor/ckeditor/samples/old/api.html create mode 100644 www/script/editor/ckeditor/samples/old/appendto.html create mode 100644 www/script/editor/ckeditor/samples/old/assets/inlineall/logo.png create mode 100644 www/script/editor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css create mode 100644 www/script/editor/ckeditor/samples/old/assets/posteddata.php create mode 100644 www/script/editor/ckeditor/samples/old/assets/sample.jpg create mode 100644 www/script/editor/ckeditor/samples/old/assets/uilanguages/languages.js create mode 100644 www/script/editor/ckeditor/samples/old/datafiltering.html create mode 100644 www/script/editor/ckeditor/samples/old/dialog/assets/my_dialog.js create mode 100644 www/script/editor/ckeditor/samples/old/dialog/dialog.html create mode 100644 www/script/editor/ckeditor/samples/old/divreplace.html create mode 100644 www/script/editor/ckeditor/samples/old/enterkey/enterkey.html create mode 100644 www/script/editor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla create mode 100644 www/script/editor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf create mode 100644 www/script/editor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js create mode 100644 www/script/editor/ckeditor/samples/old/htmlwriter/outputforflash.html create mode 100644 www/script/editor/ckeditor/samples/old/htmlwriter/outputhtml.html create mode 100644 www/script/editor/ckeditor/samples/old/index.html create mode 100644 www/script/editor/ckeditor/samples/old/inlineall.html create mode 100644 www/script/editor/ckeditor/samples/old/inlinebycode.html create mode 100644 www/script/editor/ckeditor/samples/old/inlinetextarea.html create mode 100644 www/script/editor/ckeditor/samples/old/jquery.html create mode 100644 www/script/editor/ckeditor/samples/old/magicline/magicline.html create mode 100644 www/script/editor/ckeditor/samples/old/readonly.html create mode 100644 www/script/editor/ckeditor/samples/old/replacebyclass.html create mode 100644 www/script/editor/ckeditor/samples/old/replacebycode.html create mode 100644 www/script/editor/ckeditor/samples/old/sample.css create mode 100644 www/script/editor/ckeditor/samples/old/sample.js create mode 100644 www/script/editor/ckeditor/samples/old/sample_posteddata.php create mode 100644 www/script/editor/ckeditor/samples/old/tabindex.html create mode 100644 www/script/editor/ckeditor/samples/old/toolbar/toolbar.html create mode 100644 www/script/editor/ckeditor/samples/old/uicolor.html create mode 100644 www/script/editor/ckeditor/samples/old/uilanguages.html create mode 100644 www/script/editor/ckeditor/samples/old/wysiwygarea/fullpage.html create mode 100644 www/script/editor/ckeditor/samples/old/xhtmlstyle.html create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/css/fontello.css create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/config.json create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/fontello.eot create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/fontello.svg create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/font/fontello.woff create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/index.html create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css create mode 100644 www/script/editor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js diff --git a/www/script/editor/changelog.txt b/www/script/editor/changelog.txt index 90096601a5..87669ba904 100644 --- a/www/script/editor/changelog.txt +++ b/www/script/editor/changelog.txt @@ -27,6 +27,15 @@ Go to the plugin area of CKEditor website Each time you want to add a new plugin, you have to build a new package of CKEditor from their website, to activate your new plugin. Alternatively you can copy/paste the new plugin from full package, but you have to activate it in config.js (config.extraPlugins value - see CKEditor docs) to make it work. +June, 22th, 2016 +================= +1. Upgrade to CKEditor 4.5.9 (custom package with build-config.js) - with the 2 previous custom config.js files (specific config.js for admin + front) + + +April 19th, 2016 +=================== +1. Upgade to CKEditor 4.5.8 (custom package with build-config.js) - add 2 specific config.js for admin + front - adjust Editor Helper + February 26th, 2016 =================== diff --git a/www/script/editor/ckeditor/CHANGES.md b/www/script/editor/ckeditor/CHANGES.md index f751de9932..f1fb5c7a31 100644 --- a/www/script/editor/ckeditor/CHANGES.md +++ b/www/script/editor/ckeditor/CHANGES.md @@ -1,6 +1,21 @@ CKEditor 4 Changelog ==================== +## CKEditor 4.5.9 + +Fixed Issues: + +* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets). +* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances. +* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `` element and the `height` style for the `` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin. +* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `