Ver Fonte

Merge branch 'master' into t/1791

Aleksander Nowodzinski há 6 anos atrás
pai
commit
a680cd9a89
2 ficheiros alterados com 12 adições e 3 exclusões
  1. 2 1
      docs/builds/guides/frameworks/vuejs.md
  2. 10 2
      docs/features/image-upload.md

+ 2 - 1
docs/builds/guides/frameworks/vuejs.md

@@ -199,6 +199,7 @@ npm install --save \
 Edit the `vue.config.js` file and use the following configuration. If the file is not present, create it in the root of the application (i.e. next to `package.json`):
 
 ```js
+const path = require( 'path' );
 const CKEditorWebpackPlugin = require( '@ckeditor/ckeditor5-dev-webpack-plugin' );
 const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );
 
@@ -234,7 +235,7 @@ module.exports = {
 		//		svgRule.uses.clear();
 		//
 		// * or exclude ckeditor directory from node_modules:
-		svgRule.exclude.add( __dirname + '/node_modules/@ckeditor' );
+		svgRule.exclude.add( path.join( __dirname, 'node_modules', '@ckeditor' ) );
 
 		// Add an entry for *.svg files belonging to CKEditor. You can either:
 		//

+ 10 - 2
docs/features/image-upload.md

@@ -68,9 +68,17 @@ There are two ways you can integrate CKEditor 5 with the CKFinder file manager:
 
 {@link features/ckfinder **Learn how to integrate CKEditor 5 with CKFinder in your project**}.
 
-### Simple Upload
+### Simple adapter
 
-The {@link features/simple-upload-adapter Simple Upload Adapter} enables file uploads in CKEditor 5 using the external side-server connection.
+The {@link features/simple-upload-adapter Simple upload adapter} allows uploading images to the server using the minimal [`XMLHttpRequest`](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) API and configuration.
+
+{@link features/simple-upload-adapter **Learn how to use the Simple upload adapter in CKEditor 5**}.
+
+### Base64 adapter
+
+The {@link features/base64-upload-adapter Base64 upload feature} converts images inserted into the editor into [Base64 strings](https://en.wikipedia.org/wiki/Base64) in the {@link builds/guides/integration/saving-data editor output}.
+
+{@link features/base64-upload-adapter **Learn how to use Base64–encoded images in CKEditor 5**}.
 
 ## Implementing your own upload adapter