Parcourir la source

Align code to the changes in conversion API.

Maciej Gołaszewski il y a 7 ans
Parent
commit
5ed23922c5

+ 10 - 12
packages/ckeditor5-image/src/image/imageediting.js

@@ -18,8 +18,6 @@ import {
 
 import { toImageWidget } from './utils';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement, upcastAttributeToAttribute } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 import ImageInsertCommand from './imageinsertcommand';
 
 /**
@@ -54,15 +52,15 @@ export default class ImageEditing extends Plugin {
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 
-		conversion.for( 'dataDowncast' ).add( downcastElementToElement( {
+		conversion.for( 'dataDowncast' ).elementToElement( {
 			model: 'image',
 			view: ( modelElement, viewWriter ) => createImageViewElement( viewWriter )
-		} ) );
+		} );
 
-		conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
+		conversion.for( 'editingDowncast' ).elementToElement( {
 			model: 'image',
 			view: ( modelElement, viewWriter ) => toImageWidget( createImageViewElement( viewWriter ), viewWriter, t( 'image widget' ) )
-		} ) );
+		} );
 
 		conversion.for( 'downcast' )
 			.add( modelToViewAttributeConverter( 'src' ) )
@@ -70,7 +68,7 @@ export default class ImageEditing extends Plugin {
 			.add( srcsetAttributeConverter() );
 
 		conversion.for( 'upcast' )
-			.add( upcastElementToElement( {
+			.elementToElement( {
 				view: {
 					name: 'img',
 					attributes: {
@@ -78,15 +76,15 @@ export default class ImageEditing extends Plugin {
 					}
 				},
 				model: ( viewImage, modelWriter ) => modelWriter.createElement( 'image', { src: viewImage.getAttribute( 'src' ) } )
-			} ) )
-			.add( upcastAttributeToAttribute( {
+			} )
+			.attributeToAttribute( {
 				view: {
 					name: 'img',
 					key: 'alt'
 				},
 				model: 'alt'
-			} ) )
-			.add( upcastAttributeToAttribute( {
+			} )
+			.attributeToAttribute( {
 				view: {
 					name: 'img',
 					key: 'srcset'
@@ -105,7 +103,7 @@ export default class ImageEditing extends Plugin {
 						return value;
 					}
 				}
-			} ) )
+			} )
 			.add( viewFigureToModel() );
 
 		// Register imageUpload command.

+ 2 - 3
packages/ckeditor5-image/src/imagecaption/imagecaptionediting.js

@@ -8,7 +8,6 @@
  */
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 import { isImage } from '../image/utils';
 import {
 	captionElementCreator,
@@ -55,10 +54,10 @@ export default class ImageCaptionEditing extends Plugin {
 		editor.model.document.registerPostFixer( writer => this._insertMissingModelCaptionElement( writer ) );
 
 		// View to model converter for the data pipeline.
-		editor.conversion.for( 'upcast' ).add( upcastElementToElement( {
+		editor.conversion.for( 'upcast' ).elementToElement( {
 			view: matchImageCaption,
 			model: 'caption'
-		} ) );
+		} );
 
 		// Model to view converter for the data pipeline.
 		const createCaptionForData = writer => writer.createContainerElement( 'figcaption' );

+ 2 - 3
packages/ckeditor5-image/src/imageupload/imageuploadediting.js

@@ -11,7 +11,6 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import Notification from '@ckeditor/ckeditor5-ui/src/notification/notification';
 import UpcastWriter from '@ckeditor/ckeditor5-engine/src/view/upcastwriter';
-import { upcastAttributeToAttribute } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 
 import ImageUploadCommand from '../../src/imageupload/imageuploadcommand';
 import { isImageType, isLocalImage, fetchLocalImage } from '../../src/imageupload/utils';
@@ -49,13 +48,13 @@ export default class ImageUploadEditing extends Plugin {
 
 		// Register upcast converter for uploadId.
 		conversion.for( 'upcast' )
-			.add( upcastAttributeToAttribute( {
+			.attributeToAttribute( {
 				view: {
 					name: 'img',
 					key: 'uploadId'
 				},
 				model: 'uploadId'
-			} ) );
+			} );
 
 		// Handle pasted images.
 		// For every image file, a new file loader is created and a placeholder image is

+ 7 - 10
packages/ckeditor5-image/tests/image/converters.js

@@ -11,9 +11,6 @@ import { toImageWidget } from '../../src/image/utils';
 import { createImageViewElement } from '../../src/image/imageediting';
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import env from '@ckeditor/ckeditor5-utils/src/env';
@@ -47,10 +44,10 @@ describe( 'Image converters', () => {
 				const editingElementCreator = ( modelElement, viewWriter ) =>
 					toImageWidget( createImageViewElement( viewWriter ), viewWriter, '' );
 
-				editor.conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
+				editor.conversion.for( 'editingDowncast' ).elementToElement( {
 					model: 'image',
 					view: editingElementCreator
-				} ) );
+				} );
 
 				editor.conversion.for( 'downcast' )
 					.add( modelToViewAttributeConverter( 'src' ) )
@@ -75,7 +72,7 @@ describe( 'Image converters', () => {
 
 			editor.conversion.for( 'upcast' )
 				.add( viewFigureToModel() )
-				.add( upcastElementToElement( {
+				.elementToElement( {
 					view: {
 						name: 'img',
 						attributes: {
@@ -87,7 +84,7 @@ describe( 'Image converters', () => {
 
 						return writer.createElement( 'image', { src: viewImage.getAttribute( 'src' ) } );
 					}
-				} ) );
+				} );
 		} );
 
 		it( 'should find img element among children and convert it using already defined converters', () => {
@@ -98,8 +95,8 @@ describe( 'Image converters', () => {
 		} );
 
 		it( 'should convert children allowed by schema and omit disallowed', () => {
-			editor.conversion.for( 'upcast' ).add( upcastElementToElement( { view: 'foo', model: 'foo' } ) );
-			editor.conversion.for( 'upcast' ).add( upcastElementToElement( { view: 'bar', model: 'bar' } ) );
+			editor.conversion.for( 'upcast' ).elementToElement( { view: 'foo', model: 'foo' } );
+			editor.conversion.for( 'upcast' ).elementToElement( { view: 'bar', model: 'bar' } );
 
 			schema.register( 'foo', { allowIn: 'image' } );
 			// Is allowed in root, but should not try to split image element.
@@ -112,7 +109,7 @@ describe( 'Image converters', () => {
 		} );
 
 		it( 'should split parent element when image is not allowed - in the middle', () => {
-			editor.conversion.for( 'upcast' ).add( upcastElementToElement( { view: 'div', model: 'div' } ) );
+			editor.conversion.for( 'upcast' ).elementToElement( { view: 'div', model: 'div' } );
 
 			schema.register( 'div', { inheritAllFrom: '$block' } );
 			schema.extend( 'image', { disallowIn: 'div' } );

+ 6 - 7
packages/ckeditor5-image/tests/image/imageinsertcommand.js

@@ -9,7 +9,6 @@ import ImageInsertCommand from '../../src/image/imageinsertcommand';
 import Image from '../../src/image/imageediting';
 
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'ImageInsertCommand', () => {
@@ -59,7 +58,7 @@ describe( 'ImageInsertCommand', () => {
 		it( 'should be true when the selection directly in a block', () => {
 			model.schema.register( 'block', { inheritAllFrom: '$block' } );
 			model.schema.extend( '$text', { allowIn: 'block' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block>foo[]</block>' );
 			expect( command.isEnabled ).to.be.true;
@@ -76,14 +75,14 @@ describe( 'ImageInsertCommand', () => {
 				allowContentOf: '$block',
 				isLimit: true
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'caption', view: 'figcaption' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'caption', view: 'figcaption' } );
 			setModelData( model, '<image><caption>[]</caption></image>' );
 			expect( command.isEnabled ).to.be.false;
 		} );
 
 		it( 'should be false when the selection is on other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '[<object></object>]' );
 
 			expect( command.isEnabled ).to.be.false;
@@ -92,7 +91,7 @@ describe( 'ImageInsertCommand', () => {
 		it( 'should be false when the selection is inside other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
 			model.schema.extend( '$text', { allowIn: 'object' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '<object>[]</object>' );
 
 			expect( command.isEnabled ).to.be.false;
@@ -107,7 +106,7 @@ describe( 'ImageInsertCommand', () => {
 					return false;
 				}
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block><paragraph>[]</paragraph></block>' );
 
@@ -147,7 +146,7 @@ describe( 'ImageInsertCommand', () => {
 			} );
 			model.schema.extend( '$text', { allowIn: 'other' } );
 
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'other', view: 'p' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'other', view: 'p' } );
 
 			setModelData( model, '<other>[]</other>' );
 

+ 6 - 7
packages/ckeditor5-image/tests/image/utils.js

@@ -12,7 +12,6 @@ import { isWidget, getLabel } from '@ckeditor/ckeditor5-widget/src/utils';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 import Image from '../../src/image/imageediting';
 
 describe( 'image widget utils', () => {
@@ -150,7 +149,7 @@ describe( 'image widget utils', () => {
 		it( 'should return true when the selection directly in a block', () => {
 			model.schema.register( 'block', { inheritAllFrom: '$block' } );
 			model.schema.extend( '$text', { allowIn: 'block' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block>foo[]</block>' );
 			expect( isImageAllowed( model ) ).to.be.true;
@@ -167,14 +166,14 @@ describe( 'image widget utils', () => {
 				allowContentOf: '$block',
 				isLimit: true
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'caption', view: 'figcaption' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'caption', view: 'figcaption' } );
 			setModelData( model, '<image><caption>[]</caption></image>' );
 			expect( isImageAllowed( model ) ).to.be.false;
 		} );
 
 		it( 'should return false when the selection is on other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '[<object></object>]' );
 
 			expect( isImageAllowed( model ) ).to.be.false;
@@ -183,7 +182,7 @@ describe( 'image widget utils', () => {
 		it( 'should return false when the selection is inside other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
 			model.schema.extend( '$text', { allowIn: 'object' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '<object>[]</object>' );
 
 			expect( isImageAllowed( model ) ).to.be.false;
@@ -198,7 +197,7 @@ describe( 'image widget utils', () => {
 					return false;
 				}
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block><paragraph>[]</paragraph></block>' );
 
@@ -250,7 +249,7 @@ describe( 'image widget utils', () => {
 			} );
 			model.schema.extend( '$text', { allowIn: 'other' } );
 
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'other', view: 'p' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'other', view: 'p' } );
 
 			setModelData( model, '<other>[]</other>' );
 

+ 6 - 7
packages/ckeditor5-image/tests/imageupload/imageuploadcommand.js

@@ -14,7 +14,6 @@ import { createNativeFileMock, UploadAdapterMock } from '@ckeditor/ckeditor5-upl
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import Image from '../../src/image/imageediting';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 
 import log from '@ckeditor/ckeditor5-utils/src/log';
 
@@ -78,7 +77,7 @@ describe( 'ImageUploadCommand', () => {
 		it( 'should be true when the selection directly in a block', () => {
 			model.schema.register( 'block', { inheritAllFrom: '$block' } );
 			model.schema.extend( '$text', { allowIn: 'block' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block>foo[]</block>' );
 			expect( command.isEnabled ).to.be.true;
@@ -95,14 +94,14 @@ describe( 'ImageUploadCommand', () => {
 				allowContentOf: '$block',
 				isLimit: true
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'caption', view: 'figcaption' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'caption', view: 'figcaption' } );
 			setModelData( model, '<image><caption>[]</caption></image>' );
 			expect( command.isEnabled ).to.be.false;
 		} );
 
 		it( 'should be false when the selection is on other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '[<object></object>]' );
 
 			expect( command.isEnabled ).to.be.false;
@@ -111,7 +110,7 @@ describe( 'ImageUploadCommand', () => {
 		it( 'should be false when the selection is inside other object', () => {
 			model.schema.register( 'object', { isObject: true, allowIn: '$root' } );
 			model.schema.extend( '$text', { allowIn: 'object' } );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'object', view: 'object' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'object', view: 'object' } );
 			setModelData( model, '<object>[]</object>' );
 
 			expect( command.isEnabled ).to.be.false;
@@ -126,7 +125,7 @@ describe( 'ImageUploadCommand', () => {
 					return false;
 				}
 			} );
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'block', view: 'block' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'block', view: 'block' } );
 
 			setModelData( model, '<block><paragraph>[]</paragraph></block>' );
 
@@ -169,7 +168,7 @@ describe( 'ImageUploadCommand', () => {
 			} );
 			model.schema.extend( '$text', { allowIn: 'other' } );
 
-			editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'other', view: 'p' } ) );
+			editor.conversion.for( 'downcast' ).elementToElement( { model: 'other', view: 'p' } );
 
 			setModelData( model, '<other>[]</other>' );