Przeglądaj źródła

Code improvements.

Oskar Wróbel 6 lat temu
rodzic
commit
ee3cb30808

+ 5 - 8
packages/ckeditor5-code-block/src/codeblockcommand.js

@@ -102,14 +102,15 @@ export default class CodeBlockCommand extends Command {
 	 */
 	_applyCodeBlock( writer, blocks ) {
 		const schema = this.editor.model.schema;
-		const allowedBlock = blocks.filter( block => canBeCodeBlock( schema, block ) );
+		const allowedBlocks = blocks.filter( block => canBeCodeBlock( schema, block ) );
 
-		for ( const block of allowedBlock ) {
+		for ( const block of allowedBlocks ) {
 			writer.rename( block, 'codeBlock' );
+			schema.removeDisallowedAttributes( [ block ], writer );
 		}
 
-		allowedBlock.reverse().forEach( ( currentBlock, i ) => {
-			const nextBlock = allowedBlock[ i + 1 ];
+		allowedBlocks.reverse().forEach( ( currentBlock, i ) => {
+			const nextBlock = allowedBlocks[ i + 1 ];
 
 			if ( currentBlock.previousSibling === nextBlock ) {
 				writer.appendElement( 'softBreak', nextBlock );
@@ -152,9 +153,5 @@ function canBeCodeBlock( schema, element ) {
 		return false;
 	}
 
-	if ( !schema.isBlock( element ) && !schema.checkChild( element, '$text' ) ) {
-		return false;
-	}
-
 	return true;
 }