Skip to content
This repository has been archived by the owner on Aug 4, 2019. It is now read-only.

Commit

Permalink
Upgraded to CKEditor 4.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
w8tcha committed May 3, 2018
1 parent bab31c5 commit b5754b4
Show file tree
Hide file tree
Showing 33 changed files with 209 additions and 201 deletions.
10 changes: 9 additions & 1 deletion CKEditor/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
CKEditor 4 Changelog
====================

## CKEditor 4.9.2

**Security Updates:**

* Fixed XSS vulnerability in the [Enhanced Image](https://ckeditor.com/cke4/addon/image2) (`image2`) plugin reported by [Kyaw Min Thein](https://twitter.com/kyawminthein99).

Issue summary: It was possible to execute XSS inside CKEditor using the `<img>` tag and specially crafted HTML. Please note that the default presets (Basic/Standard/Full) do not include this plugin, so you are only at risk if you made a custom build and enabled this plugin.

## CKEditor 4.9.1

Fixed Issues:

* [#1835](https://github.com/ckeditor/ckeditor-dev/issues/1835): Fixed: Integration between [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/) and [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin does not work.
* [#1835](https://github.com/ckeditor/ckeditor-dev/issues/1835): Fixed: Integration between [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/) and the [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin does not work.

## CKEditor 4.9

Expand Down
314 changes: 157 additions & 157 deletions CKEditor/ckeditor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CKEditor/plugins/codemirror/css/codemirror.min.css

Large diffs are not rendered by default.

Binary file added CKEditor/plugins/codemirror/images/autocomplete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CKEditor/plugins/codemirror/images/autoformat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CKEditor/plugins/codemirror/images/searchcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion CKEditor/plugins/codemirror/js/codemirror.addons.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CKEditor/plugins/codemirror/js/codemirror.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CKEditor/plugins/codemirror/js/codemirror.mode.php.min.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions CKEditor/plugins/codemirror/lang/bg.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'codemirror', 'bg', {
toolbar: 'Източник',
searchCode: 'Search Source',
autoFormat: 'Format Selection',
commentSelectedRange: 'Comment Selection',
uncommentSelectedRange: 'Uncomment Selection',
autoCompleteToggle: 'Enable/Disable HTML Tag Autocomplete'
toolbar: 'Код',
searchCode: 'Търси в кода',
autoFormat: 'Форматирай избраното',
commentSelectedRange: 'Коментирай избраното',
uncommentSelectedRange: 'Откоментирай избраното',
autoCompleteToggle: 'Активирай/деактивирай авто довършване за HTML тагове'
});
12 changes: 6 additions & 6 deletions CKEditor/plugins/codemirror/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
CKEDITOR.plugins.add('codemirror', {
icons: 'searchcode,autoformat,commentselectedrange,uncommentselectedrange,autocomplete', // %REMOVE_LINE_CORE%
lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh', // %REMOVE_LINE_CORE%
version: '1.17.5',
version: '1.17.6',
init: function (editor) {
var rootPath = this.path,
defaultConfig = {
Expand Down Expand Up @@ -58,15 +58,15 @@
if (editor.plugins.bbcode && config.mode.indexOf("bbcode") <= 0) {
config.mode = "bbcode";
}
var requirePresent = "function" === typeof require;
var requirePresent = "function" === typeof require && "function" === typeof require.config;

if (requirePresent){
var location = CKEDITOR.getUrl('plugins/codemirror/js');
require.config({
packages: [{
name: 'codemirror',
location: location,
main: 'codemirror.js'
main: 'codemirror.min.js'
}, {
name: 'codemirror-mode-twig',
location: location,
Expand Down Expand Up @@ -109,7 +109,7 @@
map: {
'*': {
//all the requires pointing to ../../lib/codemirror from addons will be redirected to module named codemirror.js
//which is located in bundle 'codemirror' whose js file is codemirror.js
//which is located in bundle 'codemirror' whose js file is codemirror.min.js
'lib/codemirror': 'codemirror.js'
}
}
Expand Down Expand Up @@ -301,7 +301,7 @@
} else {
if (typeof (CodeMirror) == 'undefined') {

CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.js',
CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js',
function() {

CKEDITOR.scriptLoader.load(getCodeMirrorScripts(),
Expand Down Expand Up @@ -661,7 +661,7 @@
} else {
if (typeof (CodeMirror) == 'undefined') {

CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.js',
CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js',
function() {

CKEDITOR.scriptLoader.load(getCodeMirrorScripts(),
Expand Down
2 changes: 1 addition & 1 deletion CKEditor/skins/kama/dialog.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b5754b4

Please sign in to comment.