Procházet zdrojové kódy

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

Piotrek Koszuliński před 8 roky
rodič
revize
b086640833

+ 1 - 5
packages/ckeditor5-heading/src/headingcommand.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';
 
 /**
@@ -87,8 +86,5 @@ export default class HeadingCommand extends Command {
 // @param {module:engine/model/schema~Schema} schema The schema of the document.
 // @returns {Boolean}
 function checkCanBecomeHeading( block, heading, schema ) {
-	return schema.check( {
-		name: heading,
-		inside: Position.createBefore( block )
-	} );
+	return schema.checkChild( block.parent, heading );
 }

+ 1 - 1
packages/ckeditor5-heading/tests/headingcommand.js

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

+ 6 - 6
packages/ckeditor5-heading/tests/headingengine.js

@@ -37,14 +37,14 @@ describe( 'HeadingEngine', () => {
 		expect( model.schema.isRegistered( 'heading2' ) ).to.be.true;
 		expect( model.schema.isRegistered( 'heading3' ) ).to.be.true;
 
-		expect( model.schema.check( { name: 'heading1', inside: '$root' } ) ).to.be.true;
-		expect( model.schema.check( { name: '$text', inside: 'heading1' } ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root' ], 'heading1' ) ).to.be.true;
+		expect( model.schema.checkChild( [ 'heading1' ], '$text' ) ).to.be.true;
 
-		expect( model.schema.check( { name: 'heading2', inside: '$root' } ) ).to.be.true;
-		expect( model.schema.check( { name: '$text', inside: 'heading2' } ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root' ], 'heading2' ) ).to.be.true;
+		expect( model.schema.checkChild( [ 'heading2' ], '$text' ) ).to.be.true;
 
-		expect( model.schema.check( { name: 'heading3', inside: '$root' } ) ).to.be.true;
-		expect( model.schema.check( { name: '$text', inside: 'heading3' } ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root' ], 'heading3' ) ).to.be.true;
+		expect( model.schema.checkChild( [ 'heading3' ], '$text' ) ).to.be.true;
 	} );
 
 	it( 'should register #commands', () => {