Browse Source

Merge branch 'master' into t/479

Aleksander Nowodzinski 6 years ago
parent
commit
96c4e7d35c
40 changed files with 51 additions and 57 deletions
  1. 1 1
      .eslintrc.js
  2. 1 1
      LICENSE.md
  3. 1 1
      docs/_snippets/build-classic-source.js
  4. 1 1
      docs/_snippets/builds/saving-data/autosave.js
  5. 1 1
      docs/_snippets/builds/saving-data/build-autosave-source.js
  6. 1 1
      docs/_snippets/builds/saving-data/manualsave.js
  7. 1 1
      docs/_snippets/examples/balloon-editor.js
  8. 1 1
      docs/_snippets/examples/classic-editor-short.js
  9. 1 1
      docs/_snippets/examples/classic-editor.js
  10. 1 1
      docs/_snippets/examples/custom-build.js
  11. 1 1
      docs/_snippets/examples/document-editor.js
  12. 1 1
      docs/_snippets/examples/inline-editor.js
  13. 1 1
      docs/_snippets/features/image-upload.js
  14. 1 1
      docs/_snippets/features/read-only.js
  15. 1 1
      docs/_snippets/features/ui-language.js
  16. 1 1
      docs/assets/snippet-styles.css
  17. 1 1
      docs/assets/snippet.js
  18. 1 1
      docs/assets/styles.css
  19. 2 2
      docs/builds/guides/frameworks/angular.md
  20. 3 13
      docs/builds/guides/frameworks/react.md
  21. 3 3
      docs/builds/guides/frameworks/vuejs.md
  22. 1 1
      docs/builds/guides/migrate.md
  23. 1 1
      docs/builds/guides/support/license-and-legal.md
  24. 1 1
      docs/framework/guides/architecture/ui-library.md
  25. 1 1
      docs/framework/guides/support/license-and-legal.md
  26. 7 3
      scripts/bump-year.js
  27. 1 1
      scripts/clean-up-svg-icons.sh
  28. 1 1
      scripts/docs/build-and-publish-nightly.js
  29. 1 1
      scripts/docs/build-and-publish.js
  30. 1 1
      scripts/docs/build-api-docs.js
  31. 1 1
      scripts/docs/build-docs.js
  32. 1 1
      scripts/docs/buildapi.js
  33. 1 1
      scripts/docs/getrealimportpath.js
  34. 1 1
      scripts/docs/snippetadapter.js
  35. 1 1
      scripts/release/bump-versions.js
  36. 1 1
      scripts/release/changelog.js
  37. 1 1
      scripts/release/publish.js
  38. 1 1
      scripts/release/update-mgit-branches.js
  39. 1 1
      scripts/switch-to-dev-dev.sh
  40. 1 1
      scripts/update-stable-branches.sh

+ 1 - 1
.eslintrc.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5** – https://github.com/ckeditor/ckeditor5 <br>
-Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2019, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
 

+ 1 - 1
docs/_snippets/build-classic-source.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/builds/saving-data/autosave.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/builds/saving-data/build-autosave-source.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/builds/saving-data/manualsave.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/balloon-editor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/classic-editor-short.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/classic-editor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/custom-build.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/document-editor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/examples/inline-editor.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/features/image-upload.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/features/read-only.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/_snippets/features/ui-language.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/assets/snippet-styles.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  */
 
 :root {

+ 1 - 1
docs/assets/snippet.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
docs/assets/styles.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  */
 
 /* https://github.com/ckeditor/ckeditor5/issues/913 */

+ 2 - 2
docs/builds/guides/frameworks/angular.md

@@ -83,9 +83,9 @@ export class MyComponent {
 	public Editor = DecoupledEditor;
 
 	public onReady( editor ) {
-		editor.ui.view.editable.element.parentElement.insertBefore(
+		editor.ui.getEditableElement().parentElement.insertBefore(
 			editor.ui.view.toolbar.element,
-			editor.ui.view.editable.element
+			editor.ui.getEditableElement()
 		);
 	}
 }

+ 3 - 13
docs/builds/guides/frameworks/react.md

@@ -14,16 +14,6 @@ The easiest way to use CKEditor 5 in your React application is by choosing one o
 
 ## Quick start
 
-<info-box>
-	### Compatibility with `create-react-app@2`
-
-	The latest version of `create-react-app` (2.x) does not work with CKEditor 5 Builds due to a [bug (most likely in Babel)](https://github.com/facebook/create-react-app/issues/5387).
-
-	If you want to use CKEditor 5 with an application created via `create-react-app@2` you will need to [eject the configuration even in the development mode](https://github.com/facebook/create-react-app/issues/5387#issuecomment-429255695).
-
-	Until the above issue is resolved, in this guide we will use `create-react-app@1` which does not require ejecting the configuration when testing your application in the development mode. You will have to, however, eject it anyway to [build your app for production](#note-building-for-production).
-</info-box>
-
 Install the [CKEditor 5 WYSIWYG editor component for React](https://www.npmjs.com/package/@ckeditor/ckeditor5-react) and the build of your choice.
 
 Assuming that you picked [`@ckeditor/ckeditor5-build-classic`](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-classic):
@@ -134,9 +124,9 @@ class App extends Component {
                         console.log( 'Editor is ready to use!', editor );
 
                         // Insert the toolbar before the editable area.
-                        editor.ui.view.editable.element.parentElement.insertBefore(
+                        editor.ui.getEditableElement().parentElement.insertBefore(
                             editor.ui.view.toolbar.element,
-                            editor.ui.view.editable.element
+                            editor.ui.getEditableElement()
                         );
                     } }
                     onChange={ ( event, editor ) => console.log( { event, editor } ) }
@@ -160,7 +150,7 @@ This guide assumes that you are using [Create React App CLI](https://github.com/
 Install React CLI:
 
 ```bash
-npm install -g create-react-app@1
+npm install -g create-react-app
 ```
 
 Create your project using the CLI and go to the project's directory:

+ 3 - 3
docs/builds/guides/frameworks/vuejs.md

@@ -368,9 +368,9 @@ Since accessing the editor toolbar is not possible until after the editor instan
 		methods: {
 			onReady( editor )  {
 				// Insert the toolbar before the editable area.
-				editor.ui.view.editable.element.parentElement.insertBefore(
+				editor.ui.getEditableElement().parentElement.insertBefore(
 					editor.ui.view.toolbar.element,
-					editor.ui.view.editable.element
+					editor.ui.getEditableElement()
 				);
 			}
 		}
@@ -413,7 +413,7 @@ This directive specifies the editor to be used by the component. It must directl
 
 ### `tag-name`
 
-By default, the editor component creates a `<div>` container which is used as an element passed to the editor (e.g. {@link module:editor-classic/classiceditor~ClassicEditor#element `ClassicEditor#element`}). The element can be configured, so for example to create a `<textarea>`, use the following directive:
+By default, the editor component creates a `<div>` container which is used as an element passed to the editor (e.g. {@link module:editor-classic/classiceditorui~ClassicEditorUI#element `ClassicEditor#element`}). The element can be configured, so for example to create a `<textarea>`, use the following directive:
 
 ```html
 <ckeditor :editor="editor" tag-name="textarea"></ckeditor>

+ 1 - 1
docs/builds/guides/migrate.md

@@ -211,7 +211,7 @@ Note: The number of options was reduced on purpose. We understood that configuri
 			<td><a href="/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-disableNativeSpellChecker">disableNativeSpellChecker</a></td>
 			<td>
 				<p>Unavailable, however, in case of Inline and Balloon editors can be done by setting the <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/spellcheck" target="_blank" rel="noopener"><code>spellcheck</code></a> attribute directly on the element where CKEditor should be enabled.</p>
-				<p>For Classic editor, call <code>editor.ui.view.editable.editableElement.setAttribute(&apos;spellcheck&apos;, &apos;false&apos;);</code> after creating the editor.</p>
+				<p>For Classic editor, call <code>editor.ui.getEditableElement().setAttribute(&apos;spellcheck&apos;, &apos;false&apos;);</code> after creating the editor.</p>
 			</td>
 		</tr>
 		<tr>

+ 1 - 1
docs/builds/guides/support/license-and-legal.md

@@ -10,7 +10,7 @@ order: 20
 
 The following legal notices apply to CKEditor 5 Builds and all software from CKEditor 5 Ecosystem included with it.
 
-Copyright (c) 2003-2018, CKSource Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2019, CKSource Frederico Knabben. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
 

+ 1 - 1
docs/framework/guides/architecture/ui-library.md

@@ -191,7 +191,7 @@ Similarly, when rendered, the template also takes care of DOM events. A binding
 
 Views are organized into {@link module:ui/viewcollection~ViewCollection collections} which manage their elements and propagate DOM events even further. Adding or removing a view in a collection moves the {@link module:ui/view~View#element view's element} in the DOM to reflect the position.
 
-Each editor UI has a {@link module:core/editor/editorui~EditorUI#view root view}, which can be found under `editor.ui.view`. Such view usually defines the container element of the editor and undermost view collections that other features can populate.
+Each editor UI has a "root view" (e.g. {@link e.g. {@link module:editor-classic/classiceditorui~ClassicEditorUI#view `ClassicEditor#view`}), which can be found under `editor.ui.view`. Such view usually defines the container element of the editor and undermost view collections that other features can populate.
 
 For instance, the `BoxedEditorUiView` class defines two collections:
 * {@link module:ui/editorui/boxed/boxededitoruiview~BoxedEditorUIView#top} &ndash; A collection that hosts the toolbar.

+ 1 - 1
docs/framework/guides/support/license-and-legal.md

@@ -10,7 +10,7 @@ order: 20
 
 The following legal notices apply to CKEditor 5 Framework and all software from CKEditor 5 Ecosystem included with it.
 
-Copyright (c) 2003-2018, CKSource Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2019, CKSource Frederico Knabben. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
 

+ 7 - 3
scripts/bump-year.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -60,10 +60,14 @@ function updateYear( err, fileNames ) {
 				// License headers are only required in JS files.
 				// Also, the file might have already been updated.
 				if ( fileName.endsWith( '.js' ) && !data.match( regexp ) ) {
-					console.warn( `The file "${ fileName }" misses a license header.` );
+					console.warn( `The file "${ process.cwd() }/${ fileName }" misses a license header.` );
 				}
 			} else {
-				fs.writeFile( fileName, updatedData );
+				fs.writeFile( fileName, updatedData, err => {
+					if ( err ) {
+						throw err;
+					}
+				} );
 			}
 		} );
 	} );

+ 1 - 1
scripts/clean-up-svg-icons.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
 # For licensing, see LICENSE.md.
 
 # Cleans up and optimizes SVG files using the SVGO utility.

+ 1 - 1
scripts/docs/build-and-publish-nightly.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/build-and-publish.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/build-api-docs.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/build-docs.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/buildapi.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/getrealimportpath.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/docs/snippetadapter.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/release/bump-versions.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/release/changelog.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/release/publish.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/release/update-mgit-branches.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
scripts/switch-to-dev-dev.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
 # For licensing, see LICENSE.md.
 
 # Symlinks packages from https://github.com/ckeditor/ckeditor5-dev in ckeditor5's node_modules.

+ 1 - 1
scripts/update-stable-branches.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
 # For licensing, see LICENSE.md.
 
 set -e