8
0
Quellcode durchsuchen

Merge pull request #179 from ckeditor/t/ckeditor5-engine/1295

Other: Aligning with new conversion helpers API.
Piotr Jasiun vor 7 Jahren
Ursprung
Commit
7c62dbb6c5

+ 6 - 5
packages/ckeditor5-image/src/image/imageengine.js

@@ -47,16 +47,17 @@ export default class ImageEngine extends Plugin {
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 
-		const dataElementCreator = ( item, consumable, api ) => createImageViewElement( api.writer );
-		editor.conversion.for( 'dataDowncast' ).add( downcastElementToElement( {
+		const dataElementCreator = ( modelElement, viewWriter ) => createImageViewElement( viewWriter );
+		conversion.for( 'dataDowncast' ).add( downcastElementToElement( {
 			model: 'image',
 			view: dataElementCreator
 		} ) );
 
-		const editingElementCreator = ( item, consumable, api ) =>
-			toImageWidget( createImageViewElement( api.writer ), api.writer, t( 'image widget' ) );
+		const editingElementCreator = ( modelElement, viewWriter ) => {
+			return toImageWidget( createImageViewElement( viewWriter ), viewWriter, t( 'image widget' ) );
+		};
 
-		editor.conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
+		conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
 			model: 'image',
 			view: editingElementCreator
 		} ) );

+ 4 - 5
packages/ckeditor5-image/tests/image/converters.js

@@ -13,7 +13,6 @@ import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtest
 
 import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-import { elementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/two-way-converters';
 
 import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
@@ -39,8 +38,8 @@ describe( 'Image converters', () => {
 					isBlock: true
 				} );
 
-				const editingElementCreator = ( item, consumable, api ) =>
-					toImageWidget( createImageViewElement( api.writer ), api.writer, '' );
+				const editingElementCreator = ( modelElement, viewWriter ) =>
+					toImageWidget( createImageViewElement( viewWriter ), viewWriter, '' );
 
 				editor.conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
 					model: 'image',
@@ -126,7 +125,7 @@ describe( 'Image converters', () => {
 		} );
 
 		it( 'should split parent element when image is not allowed - at the end', () => {
-			elementToElement( editor.conversion, { model: 'div', view: 'div' } );
+			editor.conversion.elementToElement( { model: 'div', view: 'div' } );
 
 			schema.register( 'div', { inheritAllFrom: '$block' } );
 			schema.extend( 'image', { disallowIn: 'div' } );
@@ -144,7 +143,7 @@ describe( 'Image converters', () => {
 		} );
 
 		it( 'should split parent element when image is not allowed - at the beginning', () => {
-			elementToElement( editor.conversion, { model: 'div', view: 'div' } );
+			editor.conversion.elementToElement( { model: 'div', view: 'div' } );
 
 			schema.register( 'div', { inheritAllFrom: '$block' } );
 			schema.extend( 'image', { disallowIn: 'div' } );

+ 4 - 5
packages/ckeditor5-image/tests/image/imageengine.js

@@ -7,7 +7,6 @@ import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtest
 import ImageEngine from '../../src/image/imageengine';
 import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
-import { elementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/two-way-converters';
 import { isImageWidget } from '../../src/image/utils';
 import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml';
 
@@ -180,7 +179,7 @@ describe( 'ImageEngine', () => {
 					}
 				} );
 
-				elementToElement( editor.conversion, { model: 'div', view: 'div' } );
+				editor.conversion.elementToElement( { model: 'div', view: 'div' } );
 
 				editor.setData( '<div><figure class="image"><img src="foo.png" alt="alt text" /></figure></div>' );
 
@@ -233,7 +232,7 @@ describe( 'ImageEngine', () => {
 					allowAttributes: 'alt'
 				} );
 
-				elementToElement( editor.conversion, { model: 'div', view: 'div' } );
+				editor.conversion.elementToElement( { model: 'div', view: 'div' } );
 
 				editor.setData( '<div alt="foo"></div>' );
 
@@ -277,7 +276,7 @@ describe( 'ImageEngine', () => {
 				beforeEach( () => {
 					model.schema.register( 'div', { inheritAllFrom: '$block' } );
 
-					elementToElement( editor.conversion, { model: 'div', view: 'div' } );
+					editor.conversion.elementToElement( { model: 'div', view: 'div' } );
 				} );
 
 				it( 'image between non-hoisted elements', () => {
@@ -359,7 +358,7 @@ describe( 'ImageEngine', () => {
 					} );
 					model.schema.extend( 'div', { allowIn: 'limit' } );
 
-					elementToElement( editor.conversion, { model: 'limit', view: 'limit' } );
+					editor.conversion.elementToElement( { model: 'limit', view: 'limit' } );
 
 					editor.setData( '<limit><div>foo<img src="foo.jpg" alt="foo" />bar</div></limit>' );
 

+ 1 - 3
packages/ckeditor5-image/tests/imagecaption/imagecaptionengine.js

@@ -18,8 +18,6 @@ import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
-import { elementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/two-way-converters';
-
 describe( 'ImageCaptionEngine', () => {
 	let editor, model, doc, view;
 
@@ -38,7 +36,7 @@ describe( 'ImageCaptionEngine', () => {
 				model.schema.extend( 'caption', { allowIn: 'widget' } );
 				model.schema.extend( '$text', { allowIn: 'widget' } );
 
-				elementToElement( editor.conversion, {
+				editor.conversion.elementToElement( {
 					model: 'widget',
 					view: 'widget'
 				} );