瀏覽代碼

Second batch of changes updating schema use to match the new API.

Piotrek Koszuliński 8 年之前
父節點
當前提交
99b4ea7420

+ 1 - 6
packages/ckeditor5-list/src/listcommand.js

@@ -8,7 +8,6 @@
  */
 
 import Command from '@ckeditor/ckeditor5-core/src/command';
-import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 import first from '@ckeditor/ckeditor5-utils/src/first';
 
 /**
@@ -308,9 +307,5 @@ function _fixType( blocks, isBackward, lowestIndent ) {
 // @param {module:engine/model/schema~Schema} schema The schema of the document.
 // @returns {Boolean}
 function checkCanBecomeListItem( block, schema ) {
-	return schema.check( {
-		name: 'listItem',
-		attributes: [ 'type', 'indent' ],
-		inside: Position.createBefore( block )
-	} );
+	return schema.checkChild( block.parent, 'listItem' );
 }

+ 1 - 1
packages/ckeditor5-list/tests/listcommand.js

@@ -255,7 +255,7 @@ describe( 'ListCommand', () => {
 				it( 'should not rename blocks which cannot become listItems', () => {
 					model.schema.register( 'restricted' );
 					model.schema.extend( 'restricted', { allowIn: '$root' } );
-					model.schema.dis.extend( 'paragraph', { allowIn: 'restricted' } );
+					model.schema.xdisallow( 'paragraph', { allowIn: 'restricted' } );
 
 					model.schema.register( 'fooBlock', { inheritAllFrom: '$block' } );
 					model.schema.extend( 'fooBlock', { allowIn: 'restricted' } );

+ 7 - 8
packages/ckeditor5-list/tests/listengine.js

@@ -54,14 +54,13 @@ describe( 'ListEngine', () => {
 		expect( model.schema.isRegistered( 'listItem' ) );
 		expect( model.schema.isBlock( 'listItem' ) );
 
-		expect( model.schema.check( { name: '$text', inside: 'listItem' } ) ).to.be.true;
-		expect( model.schema.check( { name: 'listItem', inside: 'listItem' } ) ).to.be.false;
-		expect( model.schema.check( { name: '$block', inside: 'listItem' } ) ).to.be.false;
-
-		expect( model.schema.check( { name: 'listItem', inside: '$root' } ) ).to.be.false;
-		expect( model.schema.check( { name: 'listItem', inside: '$root', attributes: [ 'indent' ] } ) ).to.be.false;
-		expect( model.schema.check( { name: 'listItem', inside: '$root', attributes: [ 'type' ] } ) ).to.be.false;
-		expect( model.schema.check( { name: 'listItem', inside: '$root', attributes: [ 'indent', 'type' ] } ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root' ], 'listItem' ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root', 'listItem' ], '$text' ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root', 'listItem' ], 'listItem' ) ).to.be.false;
+		expect( model.schema.checkChild( [ '$root', 'listItem' ], '$block' ) ).to.be.false;
+
+		expect( model.schema.checkAttribute( [ '$root', 'listItem' ], 'indent' ) ).to.be.true;
+		expect( model.schema.checkAttribute( [ '$root', 'listItem' ], 'type' ) ).to.be.true;
 	} );
 
 	describe( 'commands', () => {