Procházet zdrojové kódy

Changed default context used in DataController from String to ContextDefinition.

Oskar Wróbel před 7 roky
rodič
revize
24a0a0755c

+ 7 - 7
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -208,11 +208,11 @@ export default class DataController {
 	 *
 	 * @see #set
 	 * @param {String} data Data to parse.
-	 * @param {String} [context='$root'] Base context in which the view will be converted to the model. See:
-	 * {@link module:engine/conversion/viewconversiondispatcher~ViewConversionDispatcher#convert}.
+	 * @param {module:engine/model/schema~SchemaContextDefinition} [context=['$root']] Base context in which the view will
+	 * be converted to the model. See: {@link module:engine/conversion/viewconversiondispatcher~ViewConversionDispatcher#convert}.
 	 * @returns {module:engine/model/documentfragment~DocumentFragment} Parsed data.
 	 */
-	parse( data, context = '$root' ) {
+	parse( data, context = [ '$root' ] ) {
 		// data -> view
 		const viewDocumentFragment = this.processor.toView( data );
 
@@ -231,12 +231,12 @@ export default class DataController {
 	 *
 	 * @param {module:engine/view/element~Element|module:engine/view/documentfragment~DocumentFragment} viewElementOrFragment
 	 * Element or document fragment which content will be converted.
-	 * @param {String} [context='$root'] Base context in which the view will be converted to the model. See:
-	 * {@link module:engine/conversion/viewconversiondispatcher~ViewConversionDispatcher#convert}.
+	 * @param {module:engine/model/schema~SchemaContextDefinition} [context=['$root']] Base context in which the view will
+	 * be converted to the model. See: {@link module:engine/conversion/viewconversiondispatcher~ViewConversionDispatcher#convert}.
 	 * @returns {module:engine/model/documentfragment~DocumentFragment} Output document fragment.
 	 */
-	toModel( viewElementOrFragment, context = '$root' ) {
-		return this.viewToModel.convert( viewElementOrFragment, { context: [ context ] } );
+	toModel( viewElementOrFragment, context = [ '$root' ] ) {
+		return this.viewToModel.convert( viewElementOrFragment, context );
 	}
 
 	/**

+ 2 - 2
packages/ckeditor5-engine/tests/controller/datacontroller.js

@@ -97,7 +97,7 @@ describe( 'DataController', () => {
 		} );
 
 		it( 'should accept parsing context', () => {
-			const output = data.parse( 'foo', '$block' );
+			const output = data.parse( 'foo', [ '$block' ] );
 
 			expect( stringify( output ) ).to.equal( 'foo' );
 		} );
@@ -138,7 +138,7 @@ describe( 'DataController', () => {
 			expect( stringify( data.toModel( viewFragment ) ) ).to.equal( '' );
 
 			// Model fragment in inline root.
-			expect( stringify( data.toModel( viewFragment, 'inlineRoot' ) ) ).to.equal( 'foo' );
+			expect( stringify( data.toModel( viewFragment, [ 'inlineRoot' ] ) ) ).to.equal( 'foo' );
 		} );
 	} );