8
0
Просмотр исходного кода

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

Piotrek Koszuliński 8 лет назад
Родитель
Сommit
8ede7aa710

+ 3 - 9
packages/ckeditor5-block-quote/src/blockquotecommand.js

@@ -220,15 +220,9 @@ function getRangesOfBlockGroups( blocks ) {
 
 // Checks whether <bQ> can wrap the block.
 function checkCanBeQuoted( schema, block ) {
-	const isBQAllowed = schema.check( {
-		name: 'blockQuote',
-		inside: Position.createBefore( block )
-	} );
-	const isBlockAllowedInBQ = schema.check( {
-		name: block.name,
-		attributes: Array.from( block.getAttributeKeys() ),
-		inside: 'blockQuote'
-	} );
+	// TMP will be replaced with schema.checkWrap().
+	const isBQAllowed = schema.checkChild( block.parent, 'blockQuote' );
+	const isBlockAllowedInBQ = schema.checkChild( [ '$root', 'blockQuote' ], block );
 
 	return isBQAllowed && isBlockAllowedInBQ;
 }

+ 2 - 2
packages/ckeditor5-block-quote/tests/blockquotecommand.js

@@ -125,7 +125,7 @@ describe( 'BlockQuoteCommand', () => {
 			'is false when selection is in an element which cannot be wrapped with blockQuote' +
 			'(because mQ is not allowed in its parent)',
 			() => {
-				model.schema.dis.extend( 'blockQuote', { allowIn: '$root' } );
+				model.schema.xdisallow( 'blockQuote', { allowIn: '$root' } );
 
 				setModelData( model, '<paragraph>x[]x</paragraph>' );
 
@@ -373,7 +373,7 @@ describe( 'BlockQuoteCommand', () => {
 			it( 'should not wrap a block which can not be in a quote', () => {
 				// blockQuote is allowed in root, but fooBlock can not be inside blockQuote.
 				model.schema.register( 'fooBlock', { inheritAllFrom: '$block' } );
-				model.schema.dis.extend( 'fooBlock', { allowIn: 'blockQuote' } );
+				model.schema.xdisallow( 'fooBlock', { allowIn: 'blockQuote' } );
 				buildModelConverter().for( editor.editing.modelToView )
 					.fromElement( 'fooBlock' )
 					.toElement( 'fooblock' );

+ 3 - 3
packages/ckeditor5-block-quote/tests/blockquoteengine.js

@@ -35,12 +35,12 @@ describe( 'BlockQuoteEngine', () => {
 	} );
 
 	it( 'allows for blockQuote in the $root', () => {
-		expect( model.schema.check( { name: 'blockQuote', inside: '$root' } ) ).to.be.true;
+		expect( model.schema.checkChild( [ '$root' ], 'blockQuote' ) ).to.be.true;
 	} );
 
 	it( 'allows for $block in blockQuote', () => {
-		expect( model.schema.check( { name: '$block', inside: 'blockQuote' } ) ).to.be.true;
-		expect( model.schema.check( { name: 'paragraph', inside: 'blockQuote' } ) ).to.be.true;
+		expect( model.schema.checkChild( [ 'blockQuote' ], '$block' ) ).to.be.true;
+		expect( model.schema.checkChild( [ 'blockQuote' ], 'paragraph' ) ).to.be.true;
 	} );
 
 	it( 'adds converters to the data pipeline', () => {