8
0
Просмотр исходного кода

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 лет назад
Родитель
Сommit
84e7d45aa1

+ 5 - 0
packages/ckeditor5-adapter-ckfinder/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 Changelog
 =========
 =========
 
 
+## [10.0.4](https://github.com/ckeditor/ckeditor5-adapter-ckfinder/compare/v10.0.3...v10.0.4) (2018-12-05)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [10.0.3](https://github.com/ckeditor/ckeditor5-adapter-ckfinder/compare/v10.0.2...v10.0.3) (2018-10-08)
 ## [10.0.3](https://github.com/ckeditor/ckeditor5-adapter-ckfinder/compare/v10.0.2...v10.0.3) (2018-10-08)
 
 
 ### Other changes
 ### Other changes

+ 4 - 2
packages/ckeditor5-adapter-ckfinder/README.md

@@ -10,11 +10,13 @@ CKFinder adapter for CKEditor 5
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder/status.svg)](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder)
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder/status.svg)](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder?type=dev)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-adapter-ckfinder?type=dev)
 
 
-This package implements an upload adapter to [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/)'s backend for CKEditor 5.
+This package implements a CKEditor 5 upload adapter compatible with the [CKFinder file manager and uploader](https://ckeditor.com/ckfinder/)'s server–side connector.
 
 
 ## Documentation
 ## Documentation
 
 
-See the [`@ckeditor/ckeditor5-adapter-ckfinder` package](https://ckeditor.com/docs/ckeditor5/latest/api/adapter-ckfinder.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).
+See the ["CKFinder integration" guide](https://ckeditor.com/docs/ckeditor5/latest/features/ckfinder.html) and the [plugin documentation](https://ckeditor.com/docs/ckeditor5/latest/api/adapter-ckfinder.html) to learn how to configure the adapter.
+
+Check out the {@link features/image-upload/image-upload comprehensive "Image upload overview"} to learn about other ways to upload images into CKEditor 5.
 
 
 ## License
 ## License
 
 

+ 4 - 2
packages/ckeditor5-adapter-ckfinder/docs/api/adapter-ckfinder.md

@@ -6,11 +6,13 @@ category: api-reference
 
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-adapter-ckfinder.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-adapter-ckfinder)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-adapter-ckfinder.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-adapter-ckfinder)
 
 
-This package implements an upload adapter to [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/)'s backend for CKEditor 5.
+This package implements a CKEditor 5 upload adapter compatible with the [CKFinder file manager and uploader](https://ckeditor.com/ckfinder/)'s server–side connector.
 
 
 ## Documentation
 ## Documentation
 
 
-See the {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter} plugin documentation and the {@link features/image#image-upload Image upload} section in the {@link features/image Image feature} guide.
+See the {@link features/ckfinder "CKFinder integration" guide} and the {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter plugin documentation} to learn how to configure the adapter.
+
+Check out the {@link features/image-upload comprehensive "Image upload" guide} to learn about other ways to upload images into CKEditor 5.
 
 
 ## Installation
 ## Installation
 
 

+ 14 - 14
packages/ckeditor5-adapter-ckfinder/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@ckeditor/ckeditor5-adapter-ckfinder",
   "name": "@ckeditor/ckeditor5-adapter-ckfinder",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "description": "CKFinder adapter for CKEditor 5.",
   "description": "CKFinder adapter for CKEditor 5.",
   "keywords": [
   "keywords": [
     "ckeditor",
     "ckeditor",
@@ -10,22 +10,22 @@
     "ckeditor5-plugin"
     "ckeditor5-plugin"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-upload": "^10.0.3"
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-upload": "^10.0.4"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
-    "@ckeditor/ckeditor5-clipboard": "^10.0.3",
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
-    "@ckeditor/ckeditor5-enter": "^10.1.2",
-    "@ckeditor/ckeditor5-heading": "^10.1.0",
-    "@ckeditor/ckeditor5-image": "^11.0.0",
-    "@ckeditor/ckeditor5-list": "^11.0.2",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.3",
-    "@ckeditor/ckeditor5-typing": "^11.0.1",
-    "@ckeditor/ckeditor5-undo": "^10.0.3",
+    "@ckeditor/ckeditor5-basic-styles": "^10.1.0",
+    "@ckeditor/ckeditor5-clipboard": "^10.0.4",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.2",
+    "@ckeditor/ckeditor5-enter": "^10.1.3",
+    "@ckeditor/ckeditor5-heading": "^10.1.1",
+    "@ckeditor/ckeditor5-image": "^12.0.0",
+    "@ckeditor/ckeditor5-list": "^11.0.3",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.4",
+    "@ckeditor/ckeditor5-typing": "^11.0.2",
+    "@ckeditor/ckeditor5-undo": "^10.0.4",
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.7",
+    "eslint-config-ckeditor5": "^1.0.9",
     "husky": "^0.14.3",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.0"
     "lint-staged": "^7.0.0"
   },
   },

+ 7 - 34
packages/ckeditor5-adapter-ckfinder/src/uploadadapter.js

@@ -14,10 +14,14 @@ import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import { getCsrfToken } from './utils';
 import { getCsrfToken } from './utils';
 
 
 /**
 /**
- * A plugin that enables CKFinder uploads in CKEditor 5.
+ * A plugin that enables file uploads in CKEditor 5 using the CKFinder server–side connector.
  *
  *
- * Configure the upload URL in
- * {@link module:adapter-ckfinder/uploadadapter~CKFinderAdapterConfig#uploadUrl `ckfinder.uploadUrl`}.
+ * See the {@glink features/image-upload/ckfinder "CKFinder file manager integration" guide} to learn how to configure
+ * and use this feature as well as find out more about the full integration with the file manager
+ * provided by the {@link module:ckfinder/ckfinder~CKFinder} plugin.
+ *
+ * Check out the {@glink features/image-upload/image-upload comprehensive "Image upload overview"} to learn about
+ * other ways to upload images into CKEditor 5.
  *
  *
  * @extends module:core/plugin~Plugin
  * @extends module:core/plugin~Plugin
  */
  */
@@ -180,34 +184,3 @@ class UploadAdapter {
 		this.xhr.send( data );
 		this.xhr.send( data );
 	}
 	}
 }
 }
-
-/**
- * The configuration of the {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter CKFinder upload adapter}.
- *
- * Read more in {@link module:adapter-ckfinder/uploadadapter~CKFinderAdapterConfig}.
- *
- * @member {module:adapter-ckfinder/uploadadapter~CKFinderAdapterConfig} module:core/editor/editorconfig~EditorConfig#ckfinder
- */
-
-/**
- * The configuration of the {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter CKFinder upload adapter}.
- *
- *		ClassicEditor
- *			.create( editorElement, {
- * 				ckfinder: {
- *					uploadUrl: '/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files&responseType=json'
- * 				}
- *			} )
- *			.then( ... )
- *			.catch( ... );
- *
- * See {@link module:core/editor/editorconfig~EditorConfig all editor options}.
- *
- * @interface CKFinderAdapterConfig
- */
-
-/**
- * The URL to which files should be uploaded.
- *
- * @member {String} module:adapter-ckfinder/uploadadapter~CKFinderAdapterConfig#uploadUrl
- */

+ 4 - 2
packages/ckeditor5-adapter-ckfinder/tests/uploadadapter.js

@@ -5,6 +5,8 @@
 
 
 /* globals document */
 /* globals document */
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+
+import Clipboard from '@ckeditor/ckeditor5-clipboard/src/clipboard';
 import Image from '@ckeditor/ckeditor5-image/src/image';
 import Image from '@ckeditor/ckeditor5-image/src/image';
 import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 import CKFinderUploadAdapter from '../src/uploadadapter';
 import CKFinderUploadAdapter from '../src/uploadadapter';
@@ -24,7 +26,7 @@ describe( 'CKFinderUploadAdapter', () => {
 
 
 		return ClassicTestEditor
 		return ClassicTestEditor
 			.create( editorElement, {
 			.create( editorElement, {
-				plugins: [ Image, ImageUpload, CKFinderUploadAdapter ],
+				plugins: [ Clipboard, Image, ImageUpload, CKFinderUploadAdapter ],
 				ckfinder: {
 				ckfinder: {
 					uploadUrl: 'http://example.com'
 					uploadUrl: 'http://example.com'
 				}
 				}
@@ -65,7 +67,7 @@ describe( 'CKFinderUploadAdapter', () => {
 
 
 			return ClassicTestEditor
 			return ClassicTestEditor
 				.create( editorElement, {
 				.create( editorElement, {
-					plugins: [ Image, ImageUpload, CKFinderUploadAdapter ],
+					plugins: [ Clipboard, Image, ImageUpload, CKFinderUploadAdapter ],
 				} )
 				} )
 				.then( editor => {
 				.then( editor => {
 					const fileRepository = editor.plugins.get( FileRepository );
 					const fileRepository = editor.plugins.get( FileRepository );