瀏覽代碼

Internal: Updated schema use. See ckeditor/ckeditor5-engine#1234.

Piotrek Koszuliński 7 年之前
父節點
當前提交
4dfd749942

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

@@ -177,14 +177,11 @@ describe( 'ImageEngine', () => {
 				const editing = editor.editing;
 
 				model.schema.register( 'div', { inheritAllFrom: '$block' } );
-				model.schema.on( 'checkChild', ( evt, args ) => {
-					const def = model.schema.getDefinition( args[ 1 ] );
-
-					if ( args[ 0 ].endsWith( '$root' ) && def.name == 'image' ) {
-						evt.stop();
-						evt.return = false;
+				model.schema.addChildCheck( ( ctx, childDef ) => {
+					if ( ctx.endsWith( '$root' ) && childDef.name == 'image' ) {
+						return false;
 					}
-				}, { priority: 'high' } );
+				} );
 
 				buildModelConverter().for( data.modelToView, editing.modelToView ).fromElement( 'div' ).toElement( 'div' );
 				buildViewConverter().for( data.viewToModel ).fromElement( 'div' ).toElement( 'div' );

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

@@ -122,10 +122,9 @@ describe( 'ImageStyleEngine', () => {
 		} );
 
 		it( 'should not convert from view to model if schema prevents it', () => {
-			model.schema.on( 'checkAttribute', ( evt, args ) => {
-				if ( args[ 0 ].endsWith( 'image' ) && args[ 1 ] == 'imageStyle' ) {
-					evt.stop();
-					evt.return = false;
+			model.schema.addAttributeCheck( ( ctx, attributeName ) => {
+				if ( ctx.endsWith( 'image' ) && attributeName == 'imageStyle' ) {
+					return false;
 				}
 			} );