8
0
فهرست منبع

Changed: Image upload plugins should not require each other.

Maciej Gołaszewski 8 سال پیش
والد
کامیت
850e4d86c2

+ 2 - 1
packages/ckeditor5-upload/src/imageupload.js

@@ -10,6 +10,7 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ImageUploadButton from './imageuploadbutton';
 import ImageUploadProgress from './imageuploadprogress';
+import ImageUploadEngine from './imageuploadengine';
 
 /**
  * Image upload plugin.
@@ -31,6 +32,6 @@ export default class ImageUpload extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ ImageUploadButton, ImageUploadProgress ];
+		return [ ImageUploadEngine, ImageUploadButton, ImageUploadProgress ];
 	}
 }

+ 0 - 8
packages/ckeditor5-upload/src/imageuploadbutton.js

@@ -8,7 +8,6 @@
  */
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import ImageUploadEngine from './imageuploadengine';
 import FileDialogButtonView from './ui/filedialogbuttonview';
 import imageIcon from '@ckeditor/ckeditor5-core/theme/icons/image.svg';
 import { isImageType, findOptimalInsertionPosition } from './utils';
@@ -20,13 +19,6 @@ import { isImageType, findOptimalInsertionPosition } from './utils';
  * @extends module:core/plugin~Plugin
  */
 export default class ImageUploadButton extends Plugin {
-	/**
-	 * @inheritDoc
-	 */
-	static get requires() {
-		return [ ImageUploadEngine ];
-	}
-
 	/**
 	 * @inheritDoc
 	 */

+ 0 - 5
packages/ckeditor5-upload/src/imageuploadprogress.js

@@ -11,7 +11,6 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import FileRepository from './filerepository';
 import uploadingPlaceholder from '../theme/icons/image_placeholder.svg';
 import UIElement from '@ckeditor/ckeditor5-engine/src/view/uielement';
-import ImageUploadEngine from './imageuploadengine';
 
 import '../theme/imageuploadprogress.css';
 
@@ -25,10 +24,6 @@ export default class ImageUploadProgress extends Plugin {
 	/**
 	 * @inheritDoc
 	 */
-	static get requires() {
-		return [ ImageUploadEngine ];
-	}
-
 	constructor( editor ) {
 		super( editor );
 

+ 5 - 0
packages/ckeditor5-upload/tests/imageupload.js

@@ -8,6 +8,7 @@
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 import Image from '@ckeditor/ckeditor5-image/src/image';
 import ImageUpload from '../src/imageupload';
+import ImageUploadEngine from '../src/imageuploadengine';
 import ImageUploadProgress from '../src/imageuploadprogress';
 import ImageUploadButton from '../src/imageuploadbutton';
 
@@ -35,6 +36,10 @@ describe( 'ImageUpload', () => {
 		return editor.destroy();
 	} );
 
+	it( 'should include ImageUploadEngine', () => {
+		expect( editor.plugins.get( ImageUploadEngine ) ).to.be.instanceOf( ImageUploadEngine );
+	} );
+
 	it( 'should include ImageUploadProgress', () => {
 		expect( editor.plugins.get( ImageUploadProgress ) ).to.be.instanceOf( ImageUploadProgress );
 	} );

+ 1 - 5
packages/ckeditor5-upload/tests/imageuploadbutton.js

@@ -37,7 +37,7 @@ describe( 'ImageUploadButton', () => {
 
 		return ClassicEditor
 			.create( editorElement, {
-				plugins: [ Paragraph, Image, ImageUploadButton, FileRepository, UploadAdapterPluginMock ]
+				plugins: [ Paragraph, Image, ImageUploadEngine, ImageUploadButton, FileRepository, UploadAdapterPluginMock ]
 			} )
 			.then( newEditor => {
 				editor = newEditor;
@@ -55,10 +55,6 @@ describe( 'ImageUploadButton', () => {
 		return editor.destroy();
 	} );
 
-	it( 'should include ImageUploadEngine', () => {
-		expect( editor.plugins.get( ImageUploadEngine ) ).to.be.instanceOf( ImageUploadEngine );
-	} );
-
 	it( 'should register insertImage button', () => {
 		const button = editor.ui.componentFactory.create( 'insertImage' );
 

+ 1 - 5
packages/ckeditor5-upload/tests/imageuploadprogress.js

@@ -50,7 +50,7 @@ describe( 'ImageUploadProgress', () => {
 
 		return ClassicTestEditor
 			.create( {
-				plugins: [ ImageEngine, Paragraph, ImageUploadProgress, UploadAdapterPluginMock ]
+				plugins: [ ImageEngine, Paragraph, ImageUploadEngine, ImageUploadProgress, UploadAdapterPluginMock ]
 			} )
 			.then( newEditor => {
 				editor = newEditor;
@@ -68,10 +68,6 @@ describe( 'ImageUploadProgress', () => {
 			} );
 	} );
 
-	it( 'should include ImageUploadEngine', () => {
-		expect( editor.plugins.get( ImageUploadEngine ) ).to.be.instanceOf( ImageUploadEngine );
-	} );
-
 	it( 'should convert image\'s "reading" uploadStatus attribute', () => {
 		setModelData( model, '<paragraph>[]foo</paragraph>' );
 		editor.execute( 'imageUpload', { file: createNativeFileMock() } );