Browse Source

Changed: Aligned to changes in ckeditor5-engine.

Szymon Cofalik 7 years ago
parent
commit
2f88b5d807

+ 4 - 4
packages/ckeditor5-image/src/image/converters.js

@@ -75,8 +75,8 @@ export function srcsetAttributeConverter() {
 		dispatcher.on( 'attribute:srcset:image', converter );
 	};
 
-	function converter( evt, data, consumable, conversionApi ) {
-		if ( !consumable.consume( data.item, evt.name ) ) {
+	function converter( evt, data, conversionApi ) {
+		if ( !conversionApi.consumable.consume( data.item, evt.name ) ) {
 			return;
 		}
 
@@ -116,8 +116,8 @@ export function modelToViewAttributeConverter( attributeKey ) {
 		dispatcher.on( `attribute:${ attributeKey }:image`, converter );
 	};
 
-	function converter( evt, data, consumable, conversionApi ) {
-		if ( !consumable.consume( data.item, evt.name ) ) {
+	function converter( evt, data, conversionApi ) {
+		if ( !conversionApi.consumable.consume( data.item, evt.name ) ) {
 			return;
 		}
 

+ 2 - 2
packages/ckeditor5-image/src/imagecaption/imagecaptionengine.js

@@ -186,7 +186,7 @@ export default class ImageCaptionEngine extends Plugin {
 // @param {Boolean} [hide=true] When set to `false` view element will not be inserted when it's empty.
 // @return {Function}
 function captionModelToView( elementCreator, hide = true ) {
-	return ( evt, data, consumable, conversionApi ) => {
+	return ( evt, data, conversionApi ) => {
 		const captionElement = data.item;
 
 		// Return if element shouldn't be present when empty.
@@ -195,7 +195,7 @@ function captionModelToView( elementCreator, hide = true ) {
 		}
 
 		if ( isImage( captionElement.parent ) ) {
-			if ( !consumable.consume( data.item, 'insert' ) ) {
+			if ( !conversionApi.consumable.consume( data.item, 'insert' ) ) {
 				return;
 			}
 

+ 2 - 2
packages/ckeditor5-image/src/imagestyle/converters.js

@@ -17,8 +17,8 @@ import first from '@ckeditor/ckeditor5-utils/src/first';
  * @returns {Function} A model-to-view attribute converter.
  */
 export function modelToViewStyleAttribute( styles ) {
-	return ( evt, data, consumable, conversionApi ) => {
-		if ( !consumable.consume( data.item, evt.name ) ) {
+	return ( evt, data, conversionApi ) => {
+		if ( !conversionApi.consumable.consume( data.item, evt.name ) ) {
 			return;
 		}
 

+ 2 - 2
packages/ckeditor5-image/src/imageupload/imageuploadprogress.js

@@ -55,12 +55,12 @@ export default class ImageUploadProgress extends Plugin {
 	 * @param {module:engine/conversion/modelconsumable~ModelConsumable} consumable Values to consume.
 	 * @param {Object} conversionApi
 	 */
-	uploadStatusChange( evt, data, consumable, conversionApi ) {
+	uploadStatusChange( evt, data, conversionApi ) {
 		const editor = this.editor;
 		const modelImage = data.item;
 		const uploadId = modelImage.getAttribute( 'uploadId' );
 
-		if ( !consumable.consume( data.item, evt.name ) || !uploadId ) {
+		if ( !conversionApi.consumable.consume( data.item, evt.name ) || !uploadId ) {
 			return;
 		}
 

+ 2 - 2
packages/ckeditor5-image/tests/image/converters.js

@@ -246,8 +246,8 @@ describe( 'Image converters', () => {
 		} );
 
 		it( 'should not set attribute if change was already consumed', () => {
-			editor.editing.downcastDispatcher.on( 'attribute:alt:image', ( evt, data, consumable ) => {
-				consumable.consume( data.item, 'attribute:alt' );
+			editor.editing.downcastDispatcher.on( 'attribute:alt:image', ( evt, data, conversionApi ) => {
+				conversionApi.consumable.consume( data.item, 'attribute:alt' );
 			}, { priority: 'high' } );
 
 			setModelData( model, '<image src="" alt="foo bar"></image>' );

+ 6 - 6
packages/ckeditor5-image/tests/image/imageengine.js

@@ -86,10 +86,10 @@ describe( 'ImageEngine', () => {
 			} );
 
 			it( 'should not convert srcset attribute if is already consumed', () => {
-				editor.data.downcastDispatcher.on( 'attribute:srcset:image', ( evt, data, consumable ) => {
+				editor.data.downcastDispatcher.on( 'attribute:srcset:image', ( evt, data, conversionApi ) => {
 					const modelImage = data.item;
 
-					consumable.consume( modelImage, evt.name );
+					conversionApi.consumable.consume( modelImage, evt.name );
 				}, { priority: 'high' } );
 
 				setModelData( model,
@@ -422,8 +422,8 @@ describe( 'ImageEngine', () => {
 				setModelData( model, '<image src="foo.png" alt="alt text"></image>' );
 				const image = document.getRoot().getChild( 0 );
 
-				editor.editing.downcastDispatcher.on( 'attribute:alt:image', ( evt, data, consumable ) => {
-					consumable.consume( data.item, 'attribute:alt' );
+				editor.editing.downcastDispatcher.on( 'attribute:alt:image', ( evt, data, conversionApi ) => {
+					conversionApi.consumable.consume( data.item, 'attribute:alt' );
 				}, { priority: 'high' } );
 
 				model.change( writer => {
@@ -521,10 +521,10 @@ describe( 'ImageEngine', () => {
 			} );
 
 			it( 'should not convert srcset attribute if is already consumed', () => {
-				editor.editing.downcastDispatcher.on( 'attribute:srcset:image', ( evt, data, consumable ) => {
+				editor.editing.downcastDispatcher.on( 'attribute:srcset:image', ( evt, data, conversionApi ) => {
 					const modelImage = data.item;
 
-					consumable.consume( modelImage, evt.name );
+					conversionApi.consumable.consume( modelImage, evt.name );
 				}, { priority: 'high' } );
 
 				setModelData( model,

+ 2 - 2
packages/ckeditor5-image/tests/imagecaption/imagecaptionengine.js

@@ -142,8 +142,8 @@ describe( 'ImageCaptionEngine', () => {
 			it( 'should not convert when element is already consumed', () => {
 				editor.editing.downcastDispatcher.on(
 					'insert:caption',
-					( evt, data, consumable, conversionApi ) => {
-						consumable.consume( data.item, 'insert' );
+					( evt, data, conversionApi ) => {
+						conversionApi.consumable.consume( data.item, 'insert' );
 
 						const imageFigure = conversionApi.mapper.toViewElement( data.range.start.parent );
 						const viewElement = new ViewAttributeElement( 'span' );

+ 4 - 4
packages/ckeditor5-image/tests/imagestyle/imagestyleengine.js

@@ -192,8 +192,8 @@ describe( 'ImageStyleEngine', () => {
 		} );
 
 		it( 'should not convert from model to view if already consumed: adding attribute', () => {
-			editor.editing.downcastDispatcher.on( 'attribute:imageStyle', ( evt, data, consumable ) => {
-				consumable.consume( data.item, 'attribute:imageStyle' );
+			editor.editing.downcastDispatcher.on( 'attribute:imageStyle', ( evt, data, conversionApi ) => {
+				conversionApi.consumable.consume( data.item, 'attribute:imageStyle' );
 			}, { priority: 'high' } );
 
 			setModelData( model, '<image src="foo.png"></image>' );
@@ -209,8 +209,8 @@ describe( 'ImageStyleEngine', () => {
 		} );
 
 		it( 'should not set attribute if change was already consumed', () => {
-			editor.editing.downcastDispatcher.on( 'attribute:imageStyle', ( evt, data, consumable ) => {
-				consumable.consume( data.item, 'attribute:imageStyle' );
+			editor.editing.downcastDispatcher.on( 'attribute:imageStyle', ( evt, data, conversionApi ) => {
+				conversionApi.consumable.consume( data.item, 'attribute:imageStyle' );
 			}, { priority: 'high' } );
 
 			setModelData( model, '<image src="foo.png" imageStyle="dummyStyle"></image>' );

+ 2 - 2
packages/ckeditor5-image/tests/imageupload/imageuploadediting.js

@@ -198,8 +198,8 @@ describe( 'ImageUploadEditing', () => {
 	} );
 
 	it( 'should not convert image\'s uploadId attribute if is consumed already', () => {
-		editor.editing.downcastDispatcher.on( 'attribute:uploadId:image', ( evt, data, consumable ) => {
-			consumable.consume( data.item, evt.name );
+		editor.editing.downcastDispatcher.on( 'attribute:uploadId:image', ( evt, data, conversionApi ) => {
+			conversionApi.consumable.consume( data.item, evt.name );
 		}, { priority: 'high' } );
 
 		setModelData( model, '<image uploadId="1234"></image>' );

+ 2 - 2
packages/ckeditor5-image/tests/imageupload/imageuploadprogress.js

@@ -153,8 +153,8 @@ describe( 'ImageUploadProgress', () => {
 	} );
 
 	it( 'should not process attribute change if it is already consumed', () => {
-		editor.editing.downcastDispatcher.on( 'attribute:uploadStatus:image', ( evt, data, consumable ) => {
-			consumable.consume( data.item, evt.name );
+		editor.editing.downcastDispatcher.on( 'attribute:uploadStatus:image', ( evt, data, conversionApi ) => {
+			conversionApi.consumable.consume( data.item, evt.name );
 		}, { priority: 'highest' } );
 
 		setModelData( model, '<paragraph>[]foo</paragraph>' );