|
|
@@ -21,8 +21,6 @@ import { UploadAdapterMock, createNativeFileMock, NativeFileReaderMock } from '@
|
|
|
|
|
|
import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
|
|
|
import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
|
|
|
-import Range from '@ckeditor/ckeditor5-engine/src/model/range';
|
|
|
-import Position from '@ckeditor/ckeditor5-engine/src/model/position';
|
|
|
|
|
|
import log from '@ckeditor/ckeditor5-utils/src/log';
|
|
|
import env from '@ckeditor/ckeditor5-utils/src/env';
|
|
|
@@ -88,7 +86,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
const dataTransfer = new DataTransfer( { files: [ fileMock ], types: [ 'Files' ] } );
|
|
|
setModelData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( doc.getRoot(), 1, doc.getRoot(), 1 );
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( doc.getRoot() ), 1, model.createPositionAt( doc.getRoot(), 1 ) );
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
viewDocument.fire( 'clipboardInput', { dataTransfer, targetRanges: [ targetViewRange ] } );
|
|
|
@@ -105,7 +103,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
setModelData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
|
|
|
const paragraph = doc.getRoot().getChild( 0 );
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( paragraph, 1, paragraph, 1 ); // f[]oo
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( paragraph, 1 ), model.createPositionAt( paragraph, 1 ) ); // f[]oo
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
viewDocument.fire( 'clipboardInput', { dataTransfer, targetRanges: [ targetViewRange ] } );
|
|
|
@@ -121,7 +119,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
const dataTransfer = new DataTransfer( { files, types: [ 'Files' ] } );
|
|
|
setModelData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( doc.getRoot(), 1, doc.getRoot(), 1 );
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( doc.getRoot() ), 1, model.createPositionAt( doc.getRoot(), 1 ) );
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
viewDocument.fire( 'clipboardInput', { dataTransfer, targetRanges: [ targetViewRange ] } );
|
|
|
@@ -146,7 +144,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
|
|
|
expect( command.isEnabled ).to.be.false;
|
|
|
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( doc.getRoot(), 0, doc.getRoot(), 0 );
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( doc.getRoot() ), 0, model.createPositionAt( doc.getRoot(), 0 ) );
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
viewDocument.fire( 'clipboardInput', { dataTransfer, targetRanges: [ targetViewRange ] } );
|
|
|
@@ -208,7 +206,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
} );
|
|
|
setModelData( model, '<paragraph>[]foo</paragraph>' );
|
|
|
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( doc.getRoot(), 1, doc.getRoot(), 1 );
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( doc.getRoot() ), 1, model.createPositionAt( doc.getRoot(), 1 ) );
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
viewDocument.fire( 'clipboardInput', { dataTransfer, targetRanges: [ targetViewRange ] } );
|
|
|
@@ -247,7 +245,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
|
|
|
fileRepository.createUploadAdapter = undefined;
|
|
|
|
|
|
- const targetRange = Range.createFromParentsAndOffsets( doc.getRoot(), 1, doc.getRoot(), 1 );
|
|
|
+ const targetRange = model.createRange( model.createPositionAt( doc.getRoot() ), 1, model.createPositionAt( doc.getRoot(), 1 ) );
|
|
|
const targetViewRange = editor.editing.mapper.toViewRange( targetRange );
|
|
|
|
|
|
expect( () => {
|
|
|
@@ -468,7 +466,7 @@ describe( 'ImageUploadEditing', () => {
|
|
|
const image = doc.getRoot().getChild( 0 );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- writer.move( Range.createOn( image ), Position.createAt( doc.getRoot(), 2 ) );
|
|
|
+ writer.move( writer.createRangeOn( image ), writer.createPositionAt( doc.getRoot(), 2 ) );
|
|
|
} );
|
|
|
|
|
|
expect( abortSpy.called ).to.be.false;
|