Преглед изворни кода

Merge branch 'master' into t/1102

Piotrek Koszuliński пре 7 година
родитељ
комит
562d395d9a

+ 14 - 0
CHANGELOG.md

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+## [11.1.1](https://github.com/ckeditor/ckeditor5/compare/v11.1.0...v11.1.1) (2018-10-11)
+
+This releases fixes the README of the below listed 4 builds on npm.
+
+### Dependencies
+
+Patch releases (bug fixes, internal changes):
+
+* [@ckeditor/ckeditor5-build-balloon](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-balloon): v11.1.0 => [v11.1.1](https://github.com/ckeditor/ckeditor5-build-balloon/releases/tag/v11.1.1)
+* [@ckeditor/ckeditor5-build-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-classic): v11.1.0 => [v11.1.1](https://github.com/ckeditor/ckeditor5-build-classic/releases/tag/v11.1.1)
+* [@ckeditor/ckeditor5-build-decoupled-document](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-decoupled-document): v11.1.0 => [v11.1.1](https://github.com/ckeditor/ckeditor5-build-decoupled-document/releases/tag/v11.1.1)
+* [@ckeditor/ckeditor5-build-inline](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-inline): v11.1.0 => [v11.1.1](https://github.com/ckeditor/ckeditor5-build-inline/releases/tag/v11.1.1)
+
+
 ## [11.1.0](https://github.com/ckeditor/ckeditor5/compare/v11.0.1...v11.1.0) (2018-10-08)
 
 We are happy to report the release of CKEditor 5 v11.1.0. This editor version brings the long-awaited [media embed](https://ckeditor.com/docs/ckeditor5/latest/features/media-embed.html) feature, [support for block content in tables](https://ckeditor.com/docs/ckeditor5/latest/features/table.html#block-vs-inline-content-in-table-cells), tables available in real-time collaboration, as well as many smaller features and improvements.

+ 6 - 14
docs/builds/guides/frameworks/angular.md

@@ -32,14 +32,6 @@ Assuming that you picked [`@ckeditor/ckeditor5-build-classic`](https://www.npmjs
 npm install --save-dev @ckeditor/ckeditor5-build-classic
 ```
 
-**Note:** You may need to allow external JavaScript in your project's `tsconfig.json` for the builds to work properly:
-
-```json
-"compilerOptions": {
-	"allowJs": true
-}
-```
-
 Now, add `CKEditorModule` to your application module imports:
 
 ```ts
@@ -72,10 +64,10 @@ export class MyComponent {
 Finally, use the `<ckeditor>` tag in the template to run the rich text editor:
 
 ```html
-<ckeditor [editor]="Editor" data="<p>Hello world!</p>"></ckeditor>
+<ckeditor [editor]="Editor" data="<p>Hello, world!</p>"></ckeditor>
 ```
 
-Rebuild your application and CKEditor 5 should greet you with "Hello world!".
+Rebuild your application and CKEditor 5 should greet you with "Hello, world!".
 
 ### Note: Using the Document editor build
 
@@ -102,7 +94,7 @@ export class MyComponent {
 And then, in the template:
 
 ```html
-<ckeditor [editor]="Editor" data="<p>Hello world!</p>" (ready)="onReady($event)"></ckeditor>
+<ckeditor [editor]="Editor" data="<p>Hello, world!</p>" (ready)="onReady($event)"></ckeditor>
 ```
 
 ## Integration with `ngModel`
@@ -117,7 +109,7 @@ The component implements the [`ControlValueAccessor`](https://angular.io/api/for
 	} )
 	export class MyComponent {
 		public model = {
-			editorData: '<p>Hello world!</p>'
+			editorData: '<p>Hello, world!</p>'
 		};
 		...
 	}
@@ -154,7 +146,7 @@ The {@link module:core/editor/editorconfig~EditorConfig configuration} of the ed
 The initial data of the editor. It can be a static value:
 
 ```html
-<ckeditor data="<p>Hello world!</p>" ...></ckeditor>
+<ckeditor data="<p>Hello, world!</p>" ...></ckeditor>
 ```
 
 or a shared parent component's property
@@ -164,7 +156,7 @@ or a shared parent component's property
 	...
 } )
 export class MyComponent {
-	public editorData = '<p>Hello world!</p>';
+	public editorData = '<p>Hello, world!</p>';
 	...
 }
 ```

+ 12 - 2
docs/builds/guides/frameworks/react.md

@@ -10,10 +10,20 @@ order: 30
 
 CKEditor 5 consists of {@link builds/guides/overview ready-to-use editor builds} and {@link framework/guides/overview CKEditor 5 Framework} upon which the builds are based.
 
-The easiest way to use CKEditor 5 in your React application is by choosing one of the {@link builds/guides/overview#available-builds rich text editor builds}. Additionally, it is also possible to integrate [CKEditor 5 built from source](#integrating-ckeditor-5-from-source) into your application .
+The easiest way to use CKEditor 5 in your React application is by choosing one of the {@link builds/guides/overview#available-builds rich text editor builds}. Additionally, it is also possible to integrate [CKEditor 5 built from source](#integrating-ckeditor-5-from-source) into your application.
 
 ## 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 rich text 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):
@@ -141,7 +151,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
+npm install -g create-react-app@1
 ```
 
 Create your project using the CLI and go to the project's directory:

+ 8 - 2
docs/framework/guides/architecture/ui-library.md

@@ -387,12 +387,18 @@ const items = new Collection();
 
 items.add( {
 	type: 'button',
-	model: new Model( { label: 'Foo' } )
+	model: new Model( {
+		withText: true,
+		label: 'Foo'
+	} )
 } );
 
 items.add( {
 	type: 'button',
-	model: new Model( { label: 'Bar' } )
+	model: new Model( {
+		withText: true,
+		label: 'Bar'
+	} )
 } );
 
 // Create a dropdown with a list inside the panel.

+ 6 - 6
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckeditor5",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "The development environment of CKEditor 5 – the best browser-based rich text editor.",
   "private": true,
   "keywords": [
@@ -27,10 +27,10 @@
     "@ckeditor/ckeditor5-autosave": "^10.0.1",
     "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
     "@ckeditor/ckeditor5-block-quote": "^10.1.0",
-    "@ckeditor/ckeditor5-build-balloon": "^11.1.0",
-    "@ckeditor/ckeditor5-build-classic": "^11.1.0",
-    "@ckeditor/ckeditor5-build-decoupled-document": "^11.1.0",
-    "@ckeditor/ckeditor5-build-inline": "^11.1.0",
+    "@ckeditor/ckeditor5-build-balloon": "^11.1.1",
+    "@ckeditor/ckeditor5-build-classic": "^11.1.1",
+    "@ckeditor/ckeditor5-build-decoupled-document": "^11.1.1",
+    "@ckeditor/ckeditor5-build-inline": "^11.1.1",
     "@ckeditor/ckeditor5-clipboard": "^10.0.3",
     "@ckeditor/ckeditor5-cloud-services": "^10.1.0",
     "@ckeditor/ckeditor5-core": "^11.0.1",
@@ -61,7 +61,7 @@
     "@ckeditor/ckeditor5-widget": "^10.3.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-collaboration": "^10.1.0",
+    "@ckeditor/ckeditor5-collaboration": "^11.0.0",
     "@ckeditor/ckeditor5-dev-docs": "^10.0.3",
     "@ckeditor/ckeditor5-dev-env": "^13.0.0",
     "@ckeditor/ckeditor5-dev-tests": "^13.0.0",