浏览代码

Merge branch t/ckeditor5-engine/1236

Internal: Align code to the new conversion API, introduced in engine t/1236.
Piotr Jasiun 7 年之前
父节点
当前提交
64df8517c2

+ 1 - 1
packages/ckeditor5-typing/src/changebuffer.js

@@ -31,7 +31,7 @@ export default class ChangeBuffer {
 	/**
 	 * Creates a new instance of the change buffer.
 	 *
-	 * @param {module:engine/model/document~Document} doc
+	 * @param {module:engine/model/model~Model} model
 	 * @param {Number} [limit=20] The maximum number of atomic changes which can be contained in one batch.
 	 */
 	constructor( model, limit = 20 ) {

+ 11 - 8
packages/ckeditor5-typing/tests/input.js

@@ -11,8 +11,9 @@ import Input from '../src/input';
 
 import Writer from '@ckeditor/ckeditor5-engine/src/model/writer';
 import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
-import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
+
+import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
+import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 
 import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 import ViewElement from '@ckeditor/ckeditor5-engine/src/view/element';
@@ -40,13 +41,15 @@ describe( 'Input feature', () => {
 				// Mock image feature.
 				newEditor.model.schema.register( 'image', { allowWhere: '$text' } );
 
-				buildModelConverter().for( newEditor.data.modelToView, newEditor.editing.modelToView )
-					.fromElement( 'image' )
-					.toElement( 'img' );
+				newEditor.conversion.for( 'downcast' ).add( downcastElementToElement( {
+					model: 'image',
+					view: 'img'
+				} ) );
 
-				buildViewConverter().for( newEditor.data.viewToModel )
-					.fromElement( 'img' )
-					.toElement( 'image' );
+				newEditor.conversion.for( 'upcast' ).add( upcastElementToElement( {
+					view: 'img',
+					model: 'image'
+				} ) );
 
 				editor = newEditor;
 				model = editor.model;

+ 10 - 8
packages/ckeditor5-typing/tests/tickets/100.js

@@ -10,8 +10,8 @@ import Italic from '@ckeditor/ckeditor5-basic-styles/src/italicengine';
 import LinkEngine from '@ckeditor/ckeditor5-link/src/linkengine';
 import Input from '../../src/input';
 
-import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
-import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
+import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
+import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 
 import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 import ViewElement from '@ckeditor/ckeditor5-engine/src/view/element';
@@ -50,13 +50,15 @@ describe( 'Bug ckeditor5-typing#100', () => {
 				// Mock image feature.
 				newEditor.model.schema.register( 'image', { allowWhere: '$text' } );
 
-				buildModelConverter().for( newEditor.data.modelToView, newEditor.editing.modelToView )
-					.fromElement( 'image' )
-					.toElement( 'img' );
+				editor.conversion.for( 'downcast' ).add( downcastElementToElement( {
+					model: 'image',
+					view: 'img'
+				} ) );
 
-				buildViewConverter().for( newEditor.data.viewToModel )
-					.fromElement( 'img' )
-					.toElement( 'image' );
+				editor.conversion.for( 'upcast' ).add( upcastElementToElement( {
+					view: 'img',
+					model: 'image'
+				} ) );
 
 				// Disable MO completely and in a way it won't be reenabled on some Document#render() call.
 				const mutationObserver = view.getObserver( MutationObserver );