Skip to content

Commit

Permalink
(js) Update CKEditor to version 4.6.2
Browse files Browse the repository at this point in the history
- Add Upload Image plugin

Fixes #3986
  • Loading branch information
cgx committed Jan 13, 2017
1 parent 4158f75 commit ba12c14
Show file tree
Hide file tree
Showing 55 changed files with 591 additions and 455 deletions.
4 changes: 2 additions & 2 deletions UI/WebServerResources/js/vendor/ckeditor/LICENSE.md
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - http://ckeditor.com
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.

The following libraries are included in CKEditor under the MIT license (see Appendix D):

* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.

Expand Down
5 changes: 3 additions & 2 deletions UI/WebServerResources/js/vendor/ckeditor/build-config.js
Expand Up @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/efd88158c12886c4be7d99e4915df4d6
* (2) http://ckeditor.com/builder/5ea8a26bac20cc12a1d2d251da095b34
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/efd88158c12886c4be7d99e4915df4d6
* (3) http://ckeditor.com/builder/download/5ea8a26bac20cc12a1d2d251da095b34
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -92,6 +92,7 @@ var CKBUILDER_CONFIG = {
'tabletools' : 1,
'toolbar' : 1,
'undo' : 1,
'uploadimage' : 1,
'wsc' : 1,
'wysiwygarea' : 1
},
Expand Down
15 changes: 15 additions & 0 deletions UI/WebServerResources/js/vendor/ckeditor/ck.js
Expand Up @@ -59,13 +59,28 @@
options.scayt_sLang = locale;
}

// The Upload Image plugin requires a remote URL to be defined even though we won't use it
options.imageUploadUrl = '/SOGo/';

ck = CKEDITOR.replace(elm[0], options);

// Update the model whenever the content changes
ck.on('change', function() {
$scope.$apply(function() {
ngModel.$setViewValue(ck.getData());
});
});

// Intercept the request when an image is pasted, keep an inline base64 version only.
ck.on('fileUploadRequest', function(event) {
var data, img;
data = event.data.fileLoader.data;
img = ck.document.createElement('img');
img.setAttribute('src', data);
ck.insertElement(img);
event.cancel();
});

ngModel.$render = function(value) {
ck.setData(ngModel.$viewValue);
};
Expand Down
826 changes: 471 additions & 355 deletions UI/WebServerResources/js/vendor/ckeditor/ckeditor.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions UI/WebServerResources/js/vendor/ckeditor/config.js
Expand Up @@ -23,6 +23,7 @@ CKEDITOR.editorConfig = function( config ) {
config.tabSpaces = 4;
config.allowedContent = true; // don't filter tags
config.entities = false;
//config.uploadUrl = '/uploader/upload.php';

// Disables the built-in words spell checker if browser provides one. Defaults to true.
// http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableNativeSpellChecker
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/contents.css
@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/cs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/cy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/da.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/de.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/en.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/eu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/fi.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/fr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/hr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/hu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/is.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/it.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/lt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/mk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/nb.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/nl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/no.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pt-br.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ru.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sv.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/tr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/uk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/zh-cn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/zh.js

Large diffs are not rendered by default.

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

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

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

@@ -1,4 +1,4 @@
/*
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/

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

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

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

0 comments on commit ba12c14

Please sign in to comment.