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

Fixed how paragraph command checks schema in _checkEnabled method.

Szymon Kupś 8 лет назад
Родитель
Сommit
39bfb1201f
1 измененных файлов с 11 добавлено и 1 удалено
  1. 11 1
      packages/ckeditor5-paragraph/src/paragraphcommand.js

+ 11 - 1
packages/ckeditor5-paragraph/src/paragraphcommand.js

@@ -8,6 +8,7 @@
  */
  */
 
 
 import Command from '@ckeditor/ckeditor5-core/src/command/command';
 import Command from '@ckeditor/ckeditor5-core/src/command/command';
+import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 
 
 /**
 /**
  * The paragraph command.
  * The paragraph command.
@@ -82,9 +83,18 @@ export default class ParagraphCommand extends Command {
 	 */
 	 */
 	_checkEnabled() {
 	_checkEnabled() {
 		const block = this._getSelectedBlock();
 		const block = this._getSelectedBlock();
+
+		if ( !block ) {
+			return false;
+		}
+
 		const schema = this.editor.document.schema;
 		const schema = this.editor.document.schema;
+		const isParagraphAllowed = schema.check( {
+			name: 'paragraph',
+			inside: Position.createBefore( block )
+		} );
 
 
-		return !!block && schema.check( { name: 'paragraph', inside: block.parent.name } ) && !schema.objects.has( block.name );
+		return isParagraphAllowed && !schema.objects.has( block.name );
 	}
 	}
 
 
 	/**
 	/**