Explorar el Código

Changed: Little code refactor.

Szymon Cofalik hace 7 años
padre
commit
b7089bda47

+ 0 - 20
packages/ckeditor5-image/src/image.js

@@ -11,7 +11,6 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ImageEditing from '../src/image/imageediting';
 import Widget from '@ckeditor/ckeditor5-widget/src/widget';
 import ImageTextAlternative from './imagetextalternative';
-import { isImageWidgetSelected } from './image/utils';
 
 import '../theme/image.css';
 
@@ -36,25 +35,6 @@ export default class Image extends Plugin {
 	static get pluginName() {
 		return 'Image';
 	}
-
-	/**
-	 * @inheritDoc
-	 */
-	init() {
-		const editor = this.editor;
-		const balloonToolbar = editor.plugins.get( 'BalloonToolbar' );
-
-		// If `BalloonToolbar` plugin is loaded, it should be disabled for images
-		// which have their own toolbar to avoid duplication.
-		// https://github.com/ckeditor/ckeditor5-image/issues/110
-		if ( balloonToolbar ) {
-			this.listenTo( balloonToolbar, 'show', evt => {
-				if ( isImageWidgetSelected( editor.editing.view.document.selection ) ) {
-					evt.stop();
-				}
-			}, { priority: 'high' } );
-		}
-	}
 }
 
 /**

+ 2 - 7
packages/ckeditor5-image/src/image/imageediting.js

@@ -47,19 +47,14 @@ export default class ImageEditing extends Plugin {
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 
-		const dataElementCreator = ( modelElement, viewWriter ) => createImageViewElement( viewWriter );
 		conversion.for( 'dataDowncast' ).add( downcastElementToElement( {
 			model: 'image',
-			view: dataElementCreator
+			view: ( modelElement, viewWriter ) => createImageViewElement( viewWriter )
 		} ) );
 
-		const editingElementCreator = ( modelElement, viewWriter ) => {
-			return toImageWidget( createImageViewElement( viewWriter ), viewWriter, t( 'image widget' ) );
-		};
-
 		conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
 			model: 'image',
-			view: editingElementCreator
+			view: ( modelElement, viewWriter ) => toImageWidget( createImageViewElement( viewWriter ), viewWriter, t( 'image widget' ) )
 		} ) );
 
 		conversion.for( 'downcast' )

+ 1 - 4
packages/ckeditor5-image/src/imagecaption/imagecaptionediting.js

@@ -130,10 +130,7 @@ export default class ImageCaptionEditing extends Plugin {
 	 * @returns {Function}
 	 */
 	_fixCaptionVisibility( nodeFinder ) {
-		return ( evt, data, consumable, conversionApi ) => {
-			// There is no consumable on 'remove' event.
-			conversionApi = conversionApi ? conversionApi : consumable;
-
+		return ( evt, data, conversionApi ) => {
 			const node = nodeFinder( data );
 			const modelCaption = getParentCaption( node );
 			const mapper = this.editor.editing.mapper;

+ 3 - 1
packages/ckeditor5-image/src/imagestyle/imagestyleediting.js

@@ -104,7 +104,9 @@ export default class ImageStyleEditing extends Plugin {
 			styles.push( style );
 		}
 
-		return ( this._cachedImageStyles = styles );
+		this._cachedImageStyles = styles;
+
+		return styles;
 	}
 
 	/**