Parcourir la source

Merge branch 'master' into t/ckeditor5/1655

Kamil Piechaczek il y a 6 ans
Parent
commit
34fc6f5867
48 fichiers modifiés avec 87 ajouts et 73 suppressions
  1. 1 1
      packages/ckeditor5-core/.eslintrc.js
  2. 1 5
      packages/ckeditor5-core/.travis.yml
  3. 12 0
      packages/ckeditor5-core/CHANGELOG.md
  4. 1 1
      packages/ckeditor5-core/lang/translations/sr-latn.po
  5. 16 16
      packages/ckeditor5-core/package.json
  6. 1 1
      packages/ckeditor5-core/src/command.js
  7. 1 1
      packages/ckeditor5-core/src/commandcollection.js
  8. 1 1
      packages/ckeditor5-core/src/editingkeystrokehandler.js
  9. 1 3
      packages/ckeditor5-core/src/editor/editor.js
  10. 13 6
      packages/ckeditor5-core/src/editor/editorconfig.jsdoc
  11. 1 1
      packages/ckeditor5-core/src/editor/editorui.js
  12. 1 1
      packages/ckeditor5-core/src/editor/editorwithui.jsdoc
  13. 1 1
      packages/ckeditor5-core/src/editor/utils/attachtoform.js
  14. 1 1
      packages/ckeditor5-core/src/editor/utils/dataapimixin.js
  15. 1 1
      packages/ckeditor5-core/src/editor/utils/elementapimixin.js
  16. 1 1
      packages/ckeditor5-core/src/pendingactions.js
  17. 1 1
      packages/ckeditor5-core/src/plugin.js
  18. 1 1
      packages/ckeditor5-core/src/plugincollection.js
  19. 1 1
      packages/ckeditor5-core/tests/_utils-tests/articlepluginset.js
  20. 1 1
      packages/ckeditor5-core/tests/_utils-tests/classictesteditor.js
  21. 1 1
      packages/ckeditor5-core/tests/_utils-tests/createsinonsandbox.js
  22. 1 1
      packages/ckeditor5-core/tests/_utils-tests/modeltesteditor.js
  23. 1 1
      packages/ckeditor5-core/tests/_utils-tests/utils.js
  24. 1 1
      packages/ckeditor5-core/tests/_utils-tests/virtualtesteditor.js
  25. 1 1
      packages/ckeditor5-core/tests/_utils/articlepluginset.js
  26. 1 1
      packages/ckeditor5-core/tests/_utils/classictesteditor.js
  27. 1 1
      packages/ckeditor5-core/tests/_utils/memory.js
  28. 1 1
      packages/ckeditor5-core/tests/_utils/modeltesteditor.js
  29. 1 1
      packages/ckeditor5-core/tests/_utils/utils.js
  30. 1 1
      packages/ckeditor5-core/tests/_utils/virtualtesteditor.js
  31. 1 1
      packages/ckeditor5-core/tests/command.js
  32. 1 1
      packages/ckeditor5-core/tests/commandcollection.js
  33. 1 1
      packages/ckeditor5-core/tests/editingkeystrokehandler.js
  34. 1 1
      packages/ckeditor5-core/tests/editor/editor.js
  35. 1 1
      packages/ckeditor5-core/tests/editor/editorui.js
  36. 1 1
      packages/ckeditor5-core/tests/editor/utils/attachtoform.js
  37. 1 1
      packages/ckeditor5-core/tests/editor/utils/dataapimixin.js
  38. 1 1
      packages/ckeditor5-core/tests/editor/utils/elementapimixin.js
  39. 1 1
      packages/ckeditor5-core/tests/manual/article.js
  40. 1 1
      packages/ckeditor5-core/tests/manual/formsubmit.js
  41. 1 1
      packages/ckeditor5-core/tests/manual/pendingactions.js
  42. 1 1
      packages/ckeditor5-core/tests/manual/readonly.js
  43. 1 1
      packages/ckeditor5-core/tests/manual/version-collision.js
  44. 2 2
      packages/ckeditor5-core/tests/manual/version-collision.md
  45. 1 1
      packages/ckeditor5-core/tests/pendingactions.js
  46. 1 1
      packages/ckeditor5-core/tests/plugin.js
  47. 1 1
      packages/ckeditor5-core/tests/plugincollection.js
  48. 1 0
      packages/ckeditor5-core/theme/icons/eraser.svg

+ 1 - 1
packages/ckeditor5-core/.eslintrc.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* eslint-env node */

+ 1 - 5
packages/ckeditor5-core/.travis.yml

@@ -1,12 +1,8 @@
 sudo: required
 dist: trusty
 addons:
+  chrome: stable
   firefox: latest
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
 language: node_js
 node_js:
 - '8'

+ 12 - 0
packages/ckeditor5-core/CHANGELOG.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+## [12.1.0](https://github.com/ckeditor/ckeditor5-core/compare/v12.0.0...v12.1.0) (2019-04-10)
+
+### Features
+
+* Introduced `Command#disable()` and `Command#enable()`. Closes [#165](https://github.com/ckeditor/ckeditor5-core/issues/165). ([030ca2b](https://github.com/ckeditor/ckeditor5-core/commit/030ca2b))
+
+### Other changes
+
+* Optimized icons. ([a5f8d34](https://github.com/ckeditor/ckeditor5-core/commit/a5f8d34))
+* Updated translations. ([2dedc43](https://github.com/ckeditor/ckeditor5-core/commit/2dedc43)) 
+
+
 ## [12.0.0](https://github.com/ckeditor/ckeditor5-core/compare/v11.1.0...v12.0.0) (2019-02-28)
 
 ### Bug fixes

+ 1 - 1
packages/ckeditor5-core/lang/translations/sr-latn.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr%40latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr@latin/)\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 

+ 16 - 16
packages/ckeditor5-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-core",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "The core architecture of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "ckeditor5-lib",
@@ -21,24 +21,24 @@
     "framework"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-engine": "^13.0.0",
-    "@ckeditor/ckeditor5-utils": "^12.0.0",
+    "@ckeditor/ckeditor5-engine": "^13.1.0",
+    "@ckeditor/ckeditor5-utils": "^12.1.0",
     "lodash-es": "^4.17.10"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-autoformat": "^11.0.0",
-    "@ckeditor/ckeditor5-basic-styles": "^11.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^11.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^12.0.0",
-    "@ckeditor/ckeditor5-essentials": "^11.0.0",
-    "@ckeditor/ckeditor5-heading": "^11.0.0",
-    "@ckeditor/ckeditor5-image": "^13.0.0",
-    "@ckeditor/ckeditor5-link": "^11.0.0",
-    "@ckeditor/ckeditor5-list": "^12.0.0",
-    "@ckeditor/ckeditor5-media-embed": "^11.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^11.0.0",
-    "@ckeditor/ckeditor5-table": "^12.0.0",
-    "@ckeditor/ckeditor5-ui": "^12.0.0",
+    "@ckeditor/ckeditor5-autoformat": "^11.0.1",
+    "@ckeditor/ckeditor5-basic-styles": "^11.1.0",
+    "@ckeditor/ckeditor5-block-quote": "^11.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "^12.1.0",
+    "@ckeditor/ckeditor5-essentials": "^11.0.1",
+    "@ckeditor/ckeditor5-heading": "^11.0.1",
+    "@ckeditor/ckeditor5-image": "^13.0.1",
+    "@ckeditor/ckeditor5-link": "^11.0.1",
+    "@ckeditor/ckeditor5-list": "^12.0.1",
+    "@ckeditor/ckeditor5-media-embed": "^11.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^11.0.1",
+    "@ckeditor/ckeditor5-table": "^12.0.1",
+    "@ckeditor/ckeditor5-ui": "^12.1.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.11",
     "husky": "^1.3.1",

+ 1 - 1
packages/ckeditor5-core/src/command.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/commandcollection.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/editingkeystrokehandler.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 3
packages/ckeditor5-core/src/editor/editor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**
@@ -20,8 +20,6 @@ import EditingKeystrokeHandler from '../editingkeystrokehandler';
 import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
-import '@ckeditor/ckeditor5-utils/src/version';
-
 /**
  * Class representing a basic, generic editor.
  *

+ 13 - 6
packages/ckeditor5-core/src/editor/editorconfig.jsdoc

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**
@@ -40,19 +40,26 @@
  *			.then( ... )
  *			.catch( ... );
  *
- * By default, the editor is initialized with the content of the element on which the editor is initialized.
- * See {@link module:core/editor/editor~Editor#create Editor.create()}.
+ * By default, the editor is initialized with the content of the element on which this editor is initialized.
+ * See {@link module:core/editor/editor~Editor.create Editor.create()}.
  *
- * This configuration option lets you override initial data if an element is passed in `Editor.create()` call.
+ * This configuration option lets you override initial data if an element is passed to `Editor.create()`.
  * It is especially useful if it is difficult for your integration to put the data inside the HTML element.
  *
- * **Note:** if initial data is passed in `Editor.create()` as a parameter, an error will be thrown as those
- * two options exclude themselves.
+ * **Note:** If initial data is passed to `Editor.create()` as a parameter and, at the same time, via this configuration option,
+ * an error will be thrown as those two options exclude themselves.
  *
  * @member {String} module:core/editor/editorconfig~EditorConfig#initialData
  */
 
 /**
+ * The `config.initialData` option cannot be used together with initial data passed as the first parameter of
+ * {@link module:core/editor/editor~Editor.create `Editor.create()`}.
+ *
+ * @error editor-create-initial-data
+ */
+
+/**
  * The list of plugins to load.
  *
  * If you use an {@glink builds/guides/overview editor build} you can define the list of plugins to load

+ 1 - 1
packages/ckeditor5-core/src/editor/editorui.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/editor/editorwithui.jsdoc

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/editor/utils/attachtoform.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import { isFunction } from 'lodash-es';

+ 1 - 1
packages/ckeditor5-core/src/editor/utils/dataapimixin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/editor/utils/elementapimixin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';

+ 1 - 1
packages/ckeditor5-core/src/pendingactions.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/plugin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/src/plugincollection.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/articlepluginset.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* global document */

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/classictesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals document */

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/createsinonsandbox.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import testUtils from '../../tests/_utils/utils';

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/modeltesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Editor from '../../src/editor/editor';

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/utils.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import testUtils from '../_utils/utils';

+ 1 - 1
packages/ckeditor5-core/tests/_utils-tests/virtualtesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Editor from '../../src/editor/editor';

+ 1 - 1
packages/ckeditor5-core/tests/_utils/articlepluginset.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/tests/_utils/classictesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Editor from '../../src/editor/editor';

+ 1 - 1
packages/ckeditor5-core/tests/_utils/memory.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* global window, document, setTimeout */

+ 1 - 1
packages/ckeditor5-core/tests/_utils/modeltesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Editor from '../../src/editor/editor';

+ 1 - 1
packages/ckeditor5-core/tests/_utils/utils.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /**

+ 1 - 1
packages/ckeditor5-core/tests/_utils/virtualtesteditor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Editor from '../../src/editor/editor';

+ 1 - 1
packages/ckeditor5-core/tests/command.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Command from '../src/command';

+ 1 - 1
packages/ckeditor5-core/tests/commandcollection.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import CommandCollection from '../src/commandcollection';

+ 1 - 1
packages/ckeditor5-core/tests/editingkeystrokehandler.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import VirtualTestEditor from '../tests/_utils/virtualtesteditor';

+ 1 - 1
packages/ckeditor5-core/tests/editor/editor.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals window, setTimeout */

+ 1 - 1
packages/ckeditor5-core/tests/editor/editorui.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import EditorUI from '../../src/editor/editorui';

+ 1 - 1
packages/ckeditor5-core/tests/editor/utils/attachtoform.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import attachToForm from '../../../src/editor/utils/attachtoform';

+ 1 - 1
packages/ckeditor5-core/tests/editor/utils/dataapimixin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import DataApiMixin from '../../../src/editor/utils/dataapimixin';

+ 1 - 1
packages/ckeditor5-core/tests/editor/utils/elementapimixin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* global document */

+ 1 - 1
packages/ckeditor5-core/tests/manual/article.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals console, window, document */

+ 1 - 1
packages/ckeditor5-core/tests/manual/formsubmit.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals console, window, document */

+ 1 - 1
packages/ckeditor5-core/tests/manual/pendingactions.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals console, window, document, setTimeout */

+ 1 - 1
packages/ckeditor5-core/tests/manual/readonly.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals console, window, document */

+ 1 - 1
packages/ckeditor5-core/tests/manual/version-collision.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals console, window, document */

+ 2 - 2
packages/ckeditor5-core/tests/manual/version-collision.md

@@ -1,3 +1,3 @@
-# The editor version collision
+# The editor module duplication
 
-**Expected**: Running this manual test **must** result in the `ckeditor-version-collision` error in the console. The error is a safeguard against duplicated/invalid editor builds.
+**Expected**: Running this manual test **must** result in the `ckeditor-duplicated-modules` error in the console. The error is a safeguard against duplicated/invalid editor builds.

+ 1 - 1
packages/ckeditor5-core/tests/pendingactions.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import VirtualTestEditor from './_utils/virtualtesteditor';

+ 1 - 1
packages/ckeditor5-core/tests/plugin.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 import Plugin from '../src/plugin';

+ 1 - 1
packages/ckeditor5-core/tests/plugincollection.js

@@ -1,6 +1,6 @@
 /**
  * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
 /* globals setTimeout */

+ 1 - 0
packages/ckeditor5-core/theme/icons/eraser.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M8.636 9.531l-2.758 3.94a.5.5 0 0 0 .122.696l3.224 2.284h1.314l2.636-3.736L8.636 9.53zm.288 8.451L5.14 15.396a2 2 0 0 1-.491-2.786l6.673-9.53a2 2 0 0 1 2.785-.49l3.742 2.62a2 2 0 0 1 .491 2.785l-7.269 10.053-2.147-.066z"/><path d="M4 18h5.523v-1H4zm-2 0h1v-1H2z"/></svg>