8
0
Pārlūkot izejas kodu

Remove Position, Range, Selection imports from view/model.

Maciej Gołaszewski 7 gadi atpakaļ
vecāks
revīzija
6ab6495b7d

+ 1 - 3
packages/ckeditor5-link/src/linkediting.js

@@ -8,9 +8,7 @@
  */
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import {
-	downcastAttributeToElement
-} from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
+import { downcastAttributeToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 import { upcastElementToAttribute } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
 import LinkCommand from './linkcommand';
 import UnlinkCommand from './unlinkcommand';

+ 3 - 3
packages/ckeditor5-link/src/linkui.js

@@ -9,7 +9,6 @@
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ClickObserver from '@ckeditor/ckeditor5-engine/src/view/observer/clickobserver';
-import Range from '@ckeditor/ckeditor5-engine/src/view/range';
 import { isLinkElement } from './utils';
 import ContextualBalloon from '@ckeditor/ckeditor5-ui/src/panel/balloon/contextualballoon';
 
@@ -515,7 +514,8 @@ export default class LinkUI extends Plugin {
 	 * @returns {module:engine/view/attributeelement~AttributeElement|null}
 	 */
 	_getSelectedLinkElement() {
-		const selection = this.editor.editing.view.document.selection;
+		const view = this.editor.editing.view;
+		const selection = view.document.selection;
 
 		if ( selection.isCollapsed ) {
 			return findLinkElementAncestor( selection.getFirstPosition() );
@@ -531,7 +531,7 @@ export default class LinkUI extends Plugin {
 			}
 
 			// Check if the link element is fully selected.
-			if ( Range.createIn( startLink ).getTrimmed().isEqual( range ) ) {
+			if ( view.createRangeIn( startLink ).getTrimmed().isEqual( range ) ) {
 				return startLink;
 			} else {
 				return null;

+ 1 - 1
packages/ckeditor5-link/tests/findlinkrange.js

@@ -121,7 +121,7 @@ describe( 'findLinkRange', () => {
 		const result = findLinkRange( startPosition, 'url', model );
 
 		expect( result ).to.instanceOf( Range );
-		const expectedRange = new Range(
+		const expectedRange = model.createRange(
 			model.createPositionAt( root.getNodeByPath( [ 1 ] ), 0 ),
 			model.createPositionAt( root.getNodeByPath( [ 1 ] ), 6 )
 		);

+ 11 - 6
packages/ckeditor5-link/tests/linkui.js

@@ -19,7 +19,6 @@ import LinkActionsView from '../src/ui/linkactionsview';
 import ContextualBalloon from '@ckeditor/ckeditor5-ui/src/panel/balloon/contextualballoon';
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 
-import Range from '@ckeditor/ckeditor5-engine/src/view/range';
 import ClickObserver from '@ckeditor/ckeditor5-engine/src/view/observer/clickobserver';
 
 describe( 'LinkUI', () => {
@@ -291,7 +290,7 @@ describe( 'LinkUI', () => {
 
 				// Move selection to foo[].
 				view.change( writer => {
-					writer.setSelection( Range.createFromParentsAndOffsets( text, 3, text, 3 ), true );
+					writer.setSelection( writer.createRange( writer.createPositionAt( text, 3 ) ), true );
 				} );
 
 				sinon.assert.calledOnce( spy );
@@ -311,7 +310,7 @@ describe( 'LinkUI', () => {
 				const text = root.getChild( 0 ).getChild( 0 );
 
 				view.change( writer => {
-					writer.setSelection( Range.createFromParentsAndOffsets( text, 3, text, 3 ), true );
+					writer.setSelection( writer.createRange( writer.createPositionAt( text, 3 ) ), true );
 				} );
 
 				sinon.assert.calledOnce( spy );
@@ -334,7 +333,7 @@ describe( 'LinkUI', () => {
 
 				// Move selection to b[]ar.
 				view.change( writer => {
-					writer.setSelection( Range.createFromParentsAndOffsets( text, 1, text, 1 ), true );
+					writer.setSelection( writer.createRange( writer.createPositionAt( text, 1 ) ), true );
 				} );
 
 				sinon.assert.calledOnce( spyHide );
@@ -357,7 +356,10 @@ describe( 'LinkUI', () => {
 
 				// Move selection to f[o]o.
 				view.change( writer => {
-					writer.setSelection( Range.createFromParentsAndOffsets( text, 1, text, 2 ), true );
+					writer.setSelection( writer.createRange(
+						writer.createPositionAt( text, 1 ),
+						writer.createPositionAt( text, 2 )
+					), true );
 				} );
 
 				sinon.assert.calledOnce( spyHide );
@@ -378,7 +380,10 @@ describe( 'LinkUI', () => {
 
 				// Move selection to f[o]o.
 				view.change( writer => {
-					writer.setSelection( Range.createFromParentsAndOffsets( text, 1, text, 2 ), true );
+					writer.setSelection( writer.createRange(
+						writer.createPositionAt( text, 1 ),
+						writer.createPositionAt( text, 2 )
+					), true );
 				} );
 
 				sinon.assert.calledOnce( spyHide );

+ 2 - 3
packages/ckeditor5-link/tests/manual/tickets/113/1.js

@@ -8,8 +8,6 @@
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
 
-import Range from '@ckeditor/ckeditor5-engine/src/model/range';
-
 // Editor for the external insert.
 ClassicEditor
 	.create( document.querySelector( '#editor-insert' ), {
@@ -105,7 +103,8 @@ function startExternalDelete( editor ) {
 
 	wait( 3000 ).then( () => {
 		model.enqueueChange( 'transparent', writer => {
-			writer.remove( Range.createFromPositionAndShift( model.createPositionFromPath( model.document.getRoot(), [ 1 ] ), 1 ) );
+			const start = writer.createPositionFromPath( model.document.getRoot(), [ 1 ] );
+			writer.remove( writer.createRange( start, start.getShiftedBy( 1 ) ) );
 		} );
 	} );
 }