Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update CKEditor build to v4.14.1 #1402

Merged
merged 1 commit into from
Jul 1, 2020
Merged

chore: update CKEditor build to v4.14.1 #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/ckeditor-build-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ var CKBUILDER_CONFIG = {
'justify' : 1,
'list' : 1,
'pastefromword' : 1,
'pastetools' : 1,
'removeformat' : 1,
'tab' : 1,
'toolbar' : 1,
Expand Down
657 changes: 451 additions & 206 deletions lib/ckeditor-debug/CHANGES.md
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions lib/ckeditor-debug/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ Software License Agreement
==========================

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

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html
https://www.gnu.org/licenses/gpl.html
(See Appendix A)

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html
https://www.gnu.org/licenses/lgpl.html
(See Appendix B)

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html
https://www.mozilla.org/MPL/MPL-1.1.html
(See Appendix C)

You are not required to, but if you want to explicitly declare the
Expand All @@ -37,13 +37,14 @@ 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-2019, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2020, 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 <[email protected]> and others.
* ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.

Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):

* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, https://jquery.com/

The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):

Expand Down
10 changes: 5 additions & 5 deletions lib/ckeditor-debug/adapters/jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

Expand Down Expand Up @@ -157,10 +157,10 @@
editor.on( 'instanceReady', function( evt ) {
var editor = evt.editor;

setTimeout( function() {
setTimeout( function waitForEditor() {
// Delay bit more if editor is still not ready.
if ( !editor.element ) {
setTimeout( arguments.callee, 100 );
setTimeout( waitForEditor, 100 );
return;
}

Expand Down Expand Up @@ -265,10 +265,10 @@
} else {
// Editor is already during creation process, bind our code to the event.
editor.once( 'instanceReady', function() {
setTimeout( function() {
setTimeout( function waitForEditor() {
// Delay bit more if editor is still not ready.
if ( !editor.element ) {
setTimeout( arguments.callee, 100 );
setTimeout( waitForEditor, 100 );
return;
}

Expand Down
Loading