Explorar el Código

Merge t/ckeditor5-engine/1208

Other: Aligned code to the changes in the engine.
Piotrek Koszuliński hace 8 años
padre
commit
2103ac8671

+ 3 - 4
packages/ckeditor5-typing/src/deletecommand.js

@@ -56,14 +56,13 @@ export default class DeleteCommand extends Command {
 	 *
 	 * @fires execute
 	 * @param {Object} [options] The command options.
-	 * @param {'character'} [options.unit='character'] See {@link module:engine/controller/modifyselection~modifySelection}'s options.
+	 * @param {'character'} [options.unit='character'] See {@link module:engine/model/utils/modifyselection~modifySelection}'s options.
 	 * @param {Number} [options.sequence=1] A number describing which subsequent delete event it is without the key being released.
 	 * See the {@link module:engine/view/document~Document#event:delete} event data.
 	 */
 	execute( options = {} ) {
 		const model = this.editor.model;
 		const doc = model.document;
-		const dataController = this.editor.data;
 
 		model.enqueueChange( this._buffer.batch, writer => {
 			this._buffer.lock();
@@ -79,7 +78,7 @@ export default class DeleteCommand extends Command {
 
 			// Try to extend the selection in the specified direction.
 			if ( selection.isCollapsed ) {
-				dataController.modifySelection( selection, { direction: this.direction, unit: options.unit } );
+				model.modifySelection( selection, { direction: this.direction, unit: options.unit } );
 			}
 
 			// Check if deleting in an empty editor. See #61.
@@ -102,7 +101,7 @@ export default class DeleteCommand extends Command {
 				);
 			} );
 
-			dataController.deleteContent( selection, { doNotResetEntireContent } );
+			model.deleteContent( selection, { doNotResetEntireContent } );
 			this._buffer.input( changeCount );
 
 			doc.selection.setRanges( selection.getRanges(), selection.isBackward );

+ 1 - 1
packages/ckeditor5-typing/src/input.js

@@ -88,7 +88,7 @@ export default class Input extends Plugin {
 		buffer.lock();
 
 		model.enqueueChange( buffer.batch, () => {
-			this.editor.data.deleteContent( doc.selection );
+			this.editor.model.deleteContent( doc.selection );
 		} );
 
 		buffer.unlock();

+ 4 - 4
packages/ckeditor5-typing/tests/deletecommand.js

@@ -94,7 +94,7 @@ describe( 'DeleteCommand', () => {
 		it( 'does not try to delete when selection is at the boundary', () => {
 			const spy = sinon.spy();
 
-			editor.data.on( 'deleteContent', spy );
+			editor.model.on( 'deleteContent', spy );
 			setData( model, '<paragraph>[]foo</paragraph>' );
 
 			editor.execute( 'delete' );
@@ -106,7 +106,7 @@ describe( 'DeleteCommand', () => {
 		it( 'passes options to modifySelection', () => {
 			const spy = sinon.spy();
 
-			editor.data.on( 'modifySelection', spy );
+			editor.model.on( 'modifySelection', spy );
 			setData( model, '<paragraph>foo[]bar</paragraph>' );
 
 			editor.commands.get( 'delete' ).direction = 'forward';
@@ -123,7 +123,7 @@ describe( 'DeleteCommand', () => {
 		it( 'passes options to deleteContent #1', () => {
 			const spy = sinon.spy();
 
-			editor.data.on( 'deleteContent', spy );
+			editor.model.on( 'deleteContent', spy );
 			setData( model, '<paragraph>foo[]bar</paragraph>' );
 
 			editor.execute( 'delete' );
@@ -137,7 +137,7 @@ describe( 'DeleteCommand', () => {
 		it( 'passes options to deleteContent #2', () => {
 			const spy = sinon.spy();
 
-			editor.data.on( 'deleteContent', spy );
+			editor.model.on( 'deleteContent', spy );
 			setData( model, '<paragraph>[foobar]</paragraph>' );
 
 			editor.execute( 'delete' );