Browse Source

Merge branch 'master' into t/ckeditor5/645

Piotrek Koszuliński 7 years ago
parent
commit
546b50471c

+ 5 - 5
packages/ckeditor5-adapter-ckfinder/src/uploadadapter.js

@@ -47,7 +47,7 @@ export default class CKFinderUploadAdapter extends Plugin {
 		}
 		}
 
 
 		// Register CKFinderAdapter
 		// Register CKFinderAdapter
-		this.editor.plugins.get( FileRepository ).createAdapter = loader => new Adapter( loader, url, this.editor.t );
+		this.editor.plugins.get( FileRepository ).createUploadAdapter = loader => new UploadAdapter( loader, url, this.editor.t );
 	}
 	}
 }
 }
 
 
@@ -55,9 +55,9 @@ export default class CKFinderUploadAdapter extends Plugin {
  * Upload adapter for CKFinder.
  * Upload adapter for CKFinder.
  *
  *
  * @private
  * @private
- * @implements module:upload/filerepository~Adapter
+ * @implements module:upload/filerepository~UploadAdapter
  */
  */
-class Adapter {
+class UploadAdapter {
 	/**
 	/**
 	 * Creates a new adapter instance.
 	 * Creates a new adapter instance.
 	 *
 	 *
@@ -91,7 +91,7 @@ class Adapter {
 	/**
 	/**
 	 * Starts the upload process.
 	 * Starts the upload process.
 	 *
 	 *
-	 * @see module:upload/filerepository~Adapter#upload
+	 * @see module:upload/filerepository~UploadAdapter#upload
 	 * @returns {Promise}
 	 * @returns {Promise}
 	 */
 	 */
 	upload() {
 	upload() {
@@ -105,7 +105,7 @@ class Adapter {
 	/**
 	/**
 	 * Aborts the upload process.
 	 * Aborts the upload process.
 	 *
 	 *
-	 * @see module:upload/filerepository~Adapter#abort
+	 * @see module:upload/filerepository~UploadAdapter#abort
 	 * @returns {Promise}
 	 * @returns {Promise}
 	 */
 	 */
 	abort() {
 	abort() {

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

@@ -19,7 +19,7 @@ import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 import List from '@ckeditor/ckeditor5-list/src/list';
 import List from '@ckeditor/ckeditor5-list/src/list';
-import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 import CKFinderUploadAdapter from '../../src/uploadadapter';
 import CKFinderUploadAdapter from '../../src/uploadadapter';
 
 
 ClassicEditor
 ClassicEditor
@@ -28,7 +28,7 @@ ClassicEditor
 			Enter, Typing, Paragraph, Heading, Undo, Bold, Italic, Heading, List, Image, ImageToolbar, Clipboard,
 			Enter, Typing, Paragraph, Heading, Undo, Bold, Italic, Heading, List, Image, ImageToolbar, Clipboard,
 			ImageCaption, ImageStyle, ImageUpload, CKFinderUploadAdapter
 			ImageCaption, ImageStyle, ImageUpload, CKFinderUploadAdapter
 		],
 		],
-		toolbar: [ 'headings', '|', 'undo', 'redo', 'bold', 'italic', 'bulletedList', 'numberedList', 'insertImage' ],
+		toolbar: [ 'headings', '|', 'undo', 'redo', 'bold', 'italic', 'bulletedList', 'numberedList', 'uploadImage' ],
 		ckfinder: {
 		ckfinder: {
 			// eslint-disable-next-line max-len
 			// eslint-disable-next-line max-len
 			uploadUrl: 'https://cksource.com/weuy2g4ryt278ywiue/core/connector/php/connector.php?command=QuickUpload&type=Files&responseType=json'
 			uploadUrl: 'https://cksource.com/weuy2g4ryt278ywiue/core/connector/php/connector.php?command=QuickUpload&type=Files&responseType=json'

+ 5 - 5
packages/ckeditor5-adapter-ckfinder/tests/uploadadapter.js

@@ -6,7 +6,7 @@
 /* globals document */
 /* globals document */
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import Image from '@ckeditor/ckeditor5-image/src/image';
 import Image from '@ckeditor/ckeditor5-image/src/image';
-import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 import CKFinderUploadAdapter from '../src/uploadadapter';
 import CKFinderUploadAdapter from '../src/uploadadapter';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
@@ -42,7 +42,7 @@ describe( 'CKFinderUploadAdapter', () => {
 		expect( editor.plugins.get( CKFinderUploadAdapter ) ).to.be.instanceOf( CKFinderUploadAdapter );
 		expect( editor.plugins.get( CKFinderUploadAdapter ) ).to.be.instanceOf( CKFinderUploadAdapter );
 	} );
 	} );
 
 
-	describe( 'Adapter', () => {
+	describe( 'UploadAdapter', () => {
 		let adapter, loaderMock;
 		let adapter, loaderMock;
 
 
 		beforeEach( () => {
 		beforeEach( () => {
@@ -50,7 +50,7 @@ describe( 'CKFinderUploadAdapter', () => {
 			file.name = 'image.jpeg';
 			file.name = 'image.jpeg';
 			loaderMock = { file	};
 			loaderMock = { file	};
 
 
-			adapter = editor.plugins.get( FileRepository ).createAdapter( loaderMock );
+			adapter = editor.plugins.get( FileRepository ).createUploadAdapter( loaderMock );
 		} );
 		} );
 
 
 		it( 'crateAdapter method should be registered and have upload and abort methods', () => {
 		it( 'crateAdapter method should be registered and have upload and abort methods', () => {
@@ -59,7 +59,7 @@ describe( 'CKFinderUploadAdapter', () => {
 			expect( adapter.abort ).to.be.a( 'function' );
 			expect( adapter.abort ).to.be.a( 'function' );
 		} );
 		} );
 
 
-		it( 'should not set the FileRepository.createAdapter factory if not configured', () => {
+		it( 'should not set the FileRepository.createUploadAdapter factory if not configured', () => {
 			const editorElement = document.createElement( 'div' );
 			const editorElement = document.createElement( 'div' );
 			document.body.appendChild( editorElement );
 			document.body.appendChild( editorElement );
 
 
@@ -70,7 +70,7 @@ describe( 'CKFinderUploadAdapter', () => {
 				.then( editor => {
 				.then( editor => {
 					const fileRepository = editor.plugins.get( FileRepository );
 					const fileRepository = editor.plugins.get( FileRepository );
 
 
-					expect( fileRepository ).to.not.have.property( 'createAdapter' );
+					expect( fileRepository ).to.not.have.property( 'createUploadAdapter' );
 
 
 					editorElement.remove();
 					editorElement.remove();