瀏覽代碼

Merge branch 'master' into t/1214

Kamil Piechaczek 7 年之前
父節點
當前提交
4680556b4a

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

@@ -1,3 +1,3 @@
 <div id="snippet-image-upload">
-	<p>Paste or drop an image directly into the editor. Or use the "Insert image" button in the toolbar.</p>
+	<p>Paste or drop an image directly into the editor. You can also use the "Insert image" button in the toolbar.</p>
 </div>

+ 1 - 1
docs/builds/guides/integration/installing-plugins.md

@@ -189,7 +189,7 @@ The first method builds the plugin into the editor class. This means that you ca
 import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
 
 ClassicEditor
-	.create( document.querySelector( 'editor' ), {
+	.create( document.querySelector( '#editor' ), {
 		// Look, ma! No plugins!
 	} )
 	.then( editor => {

+ 15 - 14
docs/features/image-upload.md

@@ -1,27 +1,28 @@
 ---
-category: features
+category: features-image-upload
+order: 10
 ---
 
-# Image upload
+# Image upload overview
 
-Inserting images into content created with CKEditor is a very common task. In a properly configured editor, there are several ways for the end user to insert images:
+Inserting images into content created with CKEditor 5 is a very common task. In a properly configured rich-text editor, there are several ways for the end user to insert images:
 
 * **Pasting** it from the clipboard.
 * **Dragging** a file from the file system.
 * Selecting it through a **file system dialog**.
 * Selecting it from a **media management tool** in your application.
 
-Excluding the last option, all other ways require the image to be uploaded to a server which will be the one responsible for providing the image URL used by CKEditor to display the image in the document.
+Excluding the last option, all other ways require the image to be uploaded to a server. The server will then be responsible for providing the image URL used by CKEditor 5 to display the image in the document.
 
-{@img assets/img/image-upload-animation.svg 650 The visualization of the image upload process.}
+{@img assets/img/image-upload-animation.svg 650 The visualization of the image upload process in a WYSIWYG editor.}
 
 The software that makes the image upload possible is called an **upload adapter**. It is a callback which tells the editor how to send the file to the server. There are two main strategies of getting the image upload work you can adopt in your project:
 
-* [**Official upload adapters**](#official-upload-adapters): There are several features providing upload adapters developed and maintained by the CKEditor team. Pick the best one for your integration and let it handle the image upload in your project.
-* [**Custom upload adapters**](#implementing-your-own-upload-adapter): Create your own upload adapter from scratch using the open API architecture CKEditor 5 provides.
+* [**Official upload adapters**](#official-upload-adapters) &ndash; There are several features providing upload adapters developed and maintained by the CKEditor team. Pick the best one for your integration and let it handle the image upload in your project.
+* [**Custom upload adapters**](#implementing-your-own-upload-adapter) &ndash; Create your own upload adapter from scratch using the open API architecture of CKEditor 5.
 
 <info-box>
-	If you want to get a better look under the hood and learn more about the upload process, you can check out the {@link framework/guides/deep-dive/upload-adapter "Custom upload adpter" deep dive guide} covering that topic.
+	If you want to get a better look under the hood and learn more about the upload process, you can check out the {@link framework/guides/deep-dive/upload-adapter "Custom image upload adapter" deep dive guide}.
 </info-box>
 
 ## Demo
@@ -36,7 +37,7 @@ The demo below uses the {@link builds/guides/overview#classic-editor Classic edi
 
 ### Easy Image
 
-CKEditor 5 introduces a totally new way of handling images, with strong focus on the end–user experience. It is called {@link features/easy-image Easy Image} and its goal is to make the image upload as effortless and intuitive as possible.
+CKEditor 5 introduces a new way of handling images, with a strong focus on the end–user experience. This feature is called {@link features/easy-image Easy Image} and its goal is to make the image upload as effortless and intuitive as possible.
 
 Easy Image is part of the [CKEditor Cloud Services](https://ckeditor.com/ckeditor-cloud-services/) offer. It is a <abbr title="Software as a service">SaaS</abbr> product which:
 
@@ -44,18 +45,18 @@ Easy Image is part of the [CKEditor Cloud Services](https://ckeditor.com/ckedito
 * takes care of rescaling and optimizing them as well as providing various image sizes (responsive images),
 * delivers uploaded images through a blazing-fast CDN.
 
-All that, with virtually zero server setup.
+All that with virtually zero server setup.
 
 {@link features/easy-image **Learn how to use Easy Image in your project**}.
 
 ### CKFinder
 
-The {@link features/ckfinder CKFinder feature} provides a bridge between the editor and [CKFinder](https://ckeditor.com/ckfinder/), a browser-based file manager and a server-side connectors (PHP and .NET).
+The {@link features/ckfinder CKFinder feature} provides a bridge between the rich-text editor and [CKFinder](https://ckeditor.com/ckfinder/), a browser-based file uploader with its server-side connectors (PHP and ASP.NET).
 
 There are two ways you can integrate CKEditor 5 with the CKFinder file manager:
 
-* **With the server-side connector only**: In this scenario, images which are dropped or pasted into the editor are uploaded to a CKFinder server-side connector running on your server.
-* **With both the server-side connector and client-side file manager** (recommended): Images dropped and pasted directly into the editor are uploaded to the server (just like in the first option).
+* **With the server-side connector only** &ndash; In this scenario, images dropped or pasted into the editor are uploaded to the CKFinder server-side connector running on your server.
+* **With both the server-side connector and the client-side file manager** (recommended) &ndash; Images dropped and pasted into the editor are uploaded to the server (like in the first option).
 
 	But there are more cool features available, for instance:
 
@@ -68,6 +69,6 @@ There are two ways you can integrate CKEditor 5 with the CKFinder file manager:
 
 ## Implementing your own upload adapter
 
-CKEditor 5 provides an open API that allows you to develop your own upload adapters. Tailored to  your project, a custom adapter will allow you to take the **full control** over the process of sending the files to the server as well as passing the response from the server (e.g. the URL to the saved file) back to the editor.
+CKEditor 5 provides an open API that allows you to develop your own upload adapters. Tailored to your project, a custom adapter will allow you to take the **full control** over the process of sending the files to the server as well as passing the response from the server (e.g. the URL to the saved file) back to the WYSIWYG editor.
 
 {@link framework/guides/deep-dive/upload-adapter **Learn how to develop your own upload adapter for CKEditor 5**}.

+ 9 - 1
docs/umberto.json

@@ -18,7 +18,10 @@
 		"features/collaboration/collaborative-editing.html": "features/collaboration/real-time-collaboration/real-time-collaborative-editing.html",
 		"features/collaboration/collaborative-comments.html": "features/collaboration/real-time-collaboration/real-time-collaborative-comments.html",
 		"features/collaboration/presence-list.html": "features/collaboration/real-time-collaboration/users-in-real-time-collaboration.html",
-		"features/collaboration/comment-only-mode.html": "features/collaboration/comments/comment-only-mode.html"
+		"features/collaboration/comment-only-mode.html": "features/collaboration/comments/comment-only-mode.html",
+		"features/image-upload.html": "features/image-upload/image-upload.html",
+		"features/ckfinder.html": "features/image-upload/ckfinder.html",
+		"features/easy-image.html": "features/image-upload/easy-image.html"
 	},
 	"scripts": {
 		"snippet-adapter": "../scripts/docs/snippetadapter",
@@ -191,6 +194,11 @@
 							"order": 200
 						}
 					]
+				},
+				{
+					"name": "Image upload",
+					"id": "features-image-upload",
+					"slug": "image-upload"
 				}
 			]
 		},

+ 2 - 1
package.json

@@ -63,7 +63,8 @@
     "@ckeditor/ckeditor5-widget": "^10.3.1"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-collaboration": "^11.0.0",
+    "@ckeditor/ckeditor5-real-time-collaboration": "^12.0.1",
+    "@ckeditor/ckeditor5-comments": "^1.0.1",
     "@ckeditor/ckeditor5-dev-docs": "^10.0.3",
     "@ckeditor/ckeditor5-dev-env": "^13.0.1",
     "@ckeditor/ckeditor5-dev-tests": "^13.1.0",