Skip to content

Commit edad8ed

Browse files
authored
Merge pull request #1411 from dew326/update-ckeditor-to-4-14-1
chore: Updated CKEditor build to v4.14.1 in AlloyEditor 1.5
2 parents 4c2320d + 9bfbb81 commit edad8ed

File tree

140 files changed

+2228
-1610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+2228
-1610
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "ckeditor-dev"]
2+
ignore = dirty
3+
path = lib/ckeditor-dev
4+
url = https://github.com/ckeditor/ckeditor-dev.git
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
3-
* For licensing, see LICENSE.md or http://ckeditor.com/license
2+
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
3+
* For licensing, see LICENSE.md or https://ckeditor.com/license
44
*/
55

66
/**
@@ -10,13 +10,13 @@
1010
* If you would like to build CKEditor online again
1111
* (for example to upgrade), visit one the following links:
1212
*
13-
* (1) http://ckeditor.com/builder
13+
* (1) https://ckeditor.com/cke4/builder
1414
* Visit online builder to build CKEditor from scratch.
1515
*
16-
* (2) http://ckeditor.com/builder/e05e62fb481ae83a4074f743c787736f
16+
* (2) https://ckeditor.com/cke4/builder/56426781e5a7dd561ef56ce59194bbb7
1717
* Visit online builder to build CKEditor, starting with the same setup as before.
1818
*
19-
* (3) http://ckeditor.com/builder/download/e05e62fb481ae83a4074f743c787736f
19+
* (3) https://ckeditor.com/cke4/builder/download/56426781e5a7dd561ef56ce59194bbb7
2020
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
2121
*
2222
* NOTE:
@@ -40,7 +40,6 @@ var CKBUILDER_CONFIG = {
4040
'.mailmap',
4141
'.npm',
4242
'.travis.yml',
43-
'README.md',
4443
'bender-err.log',
4544
'bender-out.log',
4645
'bender.ci.js',
@@ -65,6 +64,7 @@ var CKBUILDER_CONFIG = {
6564
'justify' : 1,
6665
'list' : 1,
6766
'pastefromword' : 1,
67+
'pastetools' : 1,
6868
'removeformat' : 1,
6969
'tab' : 1,
7070
'toolbar' : 1,

lib/ckeditor-dev

Submodule ckeditor-dev added at eb2d116

lib/ckeditor/CHANGES.md

Lines changed: 461 additions & 195 deletions
Large diffs are not rendered by default.

lib/ckeditor/LICENSE.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ Software License Agreement
22
==========================
33

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

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

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

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

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

2222
You are not required to, but if you want to explicitly declare the
@@ -37,13 +37,14 @@ done by developers outside of CKSource with their express permission.
3737

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

40-
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2018, CKSource - Frederico Knabben.
40+
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2020, CKSource - Frederico Knabben.
4141
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
4242
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
43+
* ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.
4344

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

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

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

lib/ckeditor/README.md

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
# CKEditor 4 - Smart WYSIWYG HTML editor [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Check%20out%20CKEditor%204%20on%20GitHub&url=https%3A%2F%2Fgithub.com%2Fckeditor%2Fckeditor4)
2+
3+
[![npm version](https://badge.fury.io/js/ckeditor4.svg)](https://www.npmjs.com/package/ckeditor4)
4+
[![GitHub tag](https://img.shields.io/github/tag/ckeditor/ckeditor4.svg)](https://github.com/ckeditor/ckeditor4)
5+
6+
[![Build Status](https://travis-ci.org/ckeditor/ckeditor4.svg?branch=major)](https://travis-ci.org/ckeditor/ckeditor4)
7+
[![Dependencies](https://img.shields.io/david/ckeditor/ckeditor4.svg)](https://david-dm.org/ckeditor/ckeditor4)
8+
[![Dev dependencies](https://img.shields.io/david/dev/ckeditor/ckeditor4.svg)](https://david-dm.org/ckeditor/ckeditor4?type=dev)
9+
10+
[![Join newsletter](https://img.shields.io/badge/join-newsletter-00cc99.svg)](http://eepurl.com/c3zRPr)
11+
[![Follow Twitter](https://img.shields.io/badge/follow-twitter-00cc99.svg)](https://twitter.com/ckeditor)
12+
13+
A highly configurable WYSIWYG HTML editor with hundreds of features, from creating rich text content with captioned images, videos, tables, media embeds, emoji or mentions to pasting from Word and Google Docs and drag&drop image upload.
14+
15+
Supports a broad range of browsers, including legacy ones.
16+
17+
![CKEditor 4 screenshot](https://c.cksource.com/a/1/img/npm/ckeditor4.png)
18+
19+
## Getting started
20+
21+
### Using [npm package](https://www.npmjs.com/package/ckeditor)
22+
23+
```bash
24+
npm install --save ckeditor
25+
```
26+
27+
Use it on your website:
28+
29+
```html
30+
<div id="editor">
31+
<p>This is the editor content.</p>
32+
</div>
33+
<script src="./node_modules/ckeditor/ckeditor.js"></script>
34+
<script>
35+
CKEDITOR.replace( 'editor' );
36+
</script>
37+
```
38+
39+
### Using [CDN](https://cdn.ckeditor.com/#ckeditor4)
40+
41+
Load the CKEditor 4 script from CDN:
42+
43+
```html
44+
<div id="editor">
45+
<p>This is the editor content.</p>
46+
</div>
47+
<script src="https://cdn.ckeditor.com/4.13.0/standard/ckeditor.js"></script>
48+
<script>
49+
CKEDITOR.replace( 'editor' );
50+
</script>
51+
```
52+
53+
### Integrating with Angular and React
54+
55+
Refer to official usage guides for the [`ckeditor4-angular`](https://www.npmjs.com/package/ckeditor4-angular#usage) and [`ckeditor4-react`](https://www.npmjs.com/package/ckeditor4-react#usage) packages.
56+
57+
### Manual download
58+
59+
Visit the [CKEditor 4 download section](https://ckeditor.com/ckeditor-4/download/) on the [CKEditor website](https://ckeditor.com/ckeditor-4/) to download ready-to-use CKEditor 4 packages or to create a customized CKEditor 4 build.
60+
61+
## Features
62+
63+
* Over 500 plugins in the [Add-ons Repository](https://ckeditor.com/cke4/addons).
64+
* Pasting from Microsoft Word, Excel and Google Docs.
65+
* Drag&drop image uploads.
66+
* Media embeds to insert videos, tweets, maps, slideshows.
67+
* Powerful clipboard integration.
68+
* Content quality control with Advanced Content Filter.
69+
* Extensible widget system.
70+
* Custom table selection.
71+
* Accessibility conforming to WCAG and Section 508.
72+
* Over 70 localizations available with full RTL support.
73+
74+
## Browser support
75+
76+
| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome (Android) | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari-ios/safari-ios_48x48.png" alt="iOS Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>iOS Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
77+
| --------- | --------- | --------- | --------- | --------- | --------- | --------- |
78+
| IE8, IE9, IE10, IE11, Edge| latest version| latest version| latest version| latest version| latest version| latest version
79+
80+
Find out more in the [Browser Compatibility guide](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_browsers.html#officially-supported-browsers).
81+
82+
---
83+
84+
## Working with the `ckeditor4` repostiory
85+
86+
**Attention**: The code in this repository should be used locally and for development purposes only. We do not recommend using it in a production environment because the user experience will be very limited.
87+
88+
### Code installation
89+
90+
There is no special installation procedure to install the development code.
91+
Simply clone it to any local directory and you are set.
92+
93+
### Available branches
94+
95+
This repository contains the following branches:
96+
97+
- **`master`** &ndash; Development of the upcoming minor release.
98+
- **`major`** &ndash; Development of the upcoming major release.
99+
- **`stable`** &ndash; Latest stable release tag point (non-beta).
100+
- **`latest`** &ndash; Latest release tag point (including betas).
101+
- **`release/A.B.x`** (e.g. `4.0.x`, `4.1.x`) &ndash; Release freeze, tests and tagging. Hotfixing.
102+
103+
Note that both `master` and `major` are under heavy development. Their code did not pass the release testing phase, though, so it may be unstable.
104+
105+
Additionally, all releases have their respective tags in the following form: `4.4.0`, `4.4.1`, etc.
106+
107+
### Samples
108+
109+
The `samples/` folder contains some examples that can be used to test your installation. Visit [CKEditor 4 Examples](https://ckeditor.com/docs/ckeditor4/latest/examples/index.html) for plenty of samples showcasing numerous editor features, with source code readily available to view, copy and use in your own solution.
110+
111+
### Code structure
112+
113+
The development code contains the following main elements:
114+
115+
- Main coding folders:
116+
- `core/` &ndash; The core API of CKEditor 4. Alone, it does nothing, but it provides the entire JavaScript API that makes the magic happen.
117+
- `plugins/` &ndash; Contains most of the plugins maintained by the CKEditor 4 core team.
118+
- `skin/` &ndash; Contains the official default skin of CKEditor 4.
119+
- `dev/` &ndash; Contains some developer tools.
120+
- `tests/` &ndash; Contains the CKEditor 4 tests suite.
121+
122+
### Building a release
123+
124+
A release-optimized version of the development code can be easily created locally. The `dev/builder/build.sh` script can be used for that purpose:
125+
126+
> ./dev/builder/build.sh
127+
128+
A "release-ready" working copy of your development code will be built in the new `dev/builder/release/` folder. An Internet connection is necessary to run the builder, for the first time at least.
129+
130+
### Testing environment
131+
132+
Read more on how to set up the environment and execute tests in the [CKEditor 4 Testing Environment](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_tests.html) guide.
133+
134+
### Reporting issues
135+
136+
Use the [CKEditor 4 GitHub issue page](https://github.com/ckeditor/ckeditor4/issues) to report bugs and feature requests.
137+
138+
### License
139+
140+
Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
141+
142+
For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)

lib/ckeditor/adapters/jquery.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)