Skip to content

Commit

Permalink
Merge pull request #14601 from jdalsem/remove_annotations_enabled
Browse files Browse the repository at this point in the history
feat(ckeditor): updated to ckeditor v41.3
  • Loading branch information
jdalsem committed Apr 18, 2024
2 parents 63b2b9b + c30beef commit 87bbd25
Show file tree
Hide file tree
Showing 80 changed files with 895 additions and 935 deletions.
6 changes: 6 additions & 0 deletions mod/ckeditor/vendors/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

This dependency is a custom build of ckeditor. Using NPM and Webpack you can update ckeditor.

- ``npm install``
- change required major/minor version of the ckeditor dependencies
- ``npm update``
- ``yarn run build``

Make sure you only commit changes in the `build` folder.

With a configuration in the `webpack.config.js` we extract all editor and content css into `build/styles.css`.
Expand All @@ -12,3 +17,4 @@ The content related styling resides in the `ckeditor/content.css` view.
You can update those using: https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/content-styles.html#the-full-list-of-content-styles

The `blockquote` styling is removed as that is already provided by Elgg.
Also the mentions styling ``-ck-color-mention-*`` is changed to be more inline with default Elgg styling.
2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/ckeditor.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions mod/ckeditor/vendors/ckeditor5/build/ckeditor.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@

/* istanbul ignore next: paranoid check -- @preserve */

/* istanbul ignore next: static function definition -- @preserve */

/*!
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

/**
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

Expand Down
2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/ckeditor.js.map

Large diffs are not rendered by default.

61 changes: 37 additions & 24 deletions mod/ckeditor/vendors/ckeditor5/build/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/styles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/translations/af.js

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

2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/translations/ar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mod/ckeditor/vendors/ckeditor5/build/translations/ast.js

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

0 comments on commit 87bbd25

Please sign in to comment.