Browse Source

Use writer to create Ranges/Positions in private API.

Maciej Gołaszewski 7 years ago
parent
commit
4dd4af925f

+ 1 - 1
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -227,7 +227,7 @@ export default class DataController {
 			writer.setSelection( null );
 			writer.removeSelectionAttribute( this.model.document.selection.getAttributeKeys() );
 
-			writer.remove( ModelRange._createIn( modelRoot ) );
+			writer.remove( writer.createRangeIn( modelRoot ) );
 			writer.insert( this.parse( data, modelRoot ), modelRoot, 0 );
 		} );
 	}

+ 1 - 1
packages/ckeditor5-engine/src/dev-utils/model.js

@@ -115,7 +115,7 @@ export function setData( model, data, options = {} ) {
 
 	model.change( writer => {
 		// Replace existing model in document by new one.
-		writer.remove( ModelRange._createIn( modelRoot ) );
+		writer.remove( writer.createRangeIn( modelRoot ) );
 		writer.insert( modelDocumentFragment, modelRoot );
 
 		// Clean up previous document selection.

+ 2 - 3
packages/ckeditor5-engine/src/model/utils/deletecontent.js

@@ -8,7 +8,6 @@
  */
 
 import LivePosition from '../liveposition';
-import Position from '../position';
 import Range from '../range';
 import DocumentSelection from '../documentselection';
 
@@ -206,8 +205,8 @@ function insertParagraph( writer, position, selection ) {
 function replaceEntireContentWithParagraph( writer, selection ) {
 	const limitElement = writer.model.schema.getLimitElement( selection );
 
-	writer.remove( Range._createIn( limitElement ) );
-	insertParagraph( writer, Position._createAt( limitElement, 0 ), selection );
+	writer.remove( writer.createRangeIn( limitElement ) );
+	insertParagraph( writer, writer.createPositionAt( limitElement, 0 ), selection );
 }
 
 // We want to replace the entire content with a paragraph when:

+ 3 - 3
packages/ckeditor5-engine/tests/model/documentselection.js

@@ -656,7 +656,7 @@ describe( 'DocumentSelection', () => {
 				selection._setAttribute( 'foo', 'bar' );
 
 				model.change( writer => {
-					writer.move( Range._createOn( fullP.getChild( 0 ) ), rangeInEmptyP.start );
+					writer.move( writer.createRangeOn( fullP.getChild( 0 ) ), rangeInEmptyP.start );
 				} );
 
 				expect( emptyP.hasAttribute( fooStoreAttrKey ) ).to.be.false;
@@ -671,7 +671,7 @@ describe( 'DocumentSelection', () => {
 
 				model.change( writer => {
 					// <emptyP>{}<emptyP2>
-					writer.merge( Position._createAfter( emptyP ) );
+					writer.merge( writer.createPositionAfter( emptyP ) );
 				} );
 
 				expect( emptyP.hasAttribute( fooStoreAttrKey ) ).to.be.false;
@@ -717,7 +717,7 @@ describe( 'DocumentSelection', () => {
 
 				model.change( writer => {
 					// <emptyP>{}<emptyP2>
-					writer.merge( Position._createAfter( emptyP ) );
+					writer.merge( writer.createPositionAfter( emptyP ) );
 				} );
 
 				expect( emptyP.getAttribute( fooStoreAttrKey ) ).to.equal( 'bar' );

+ 1 - 1
packages/ckeditor5-engine/tests/model/operation/transform/utils.js

@@ -54,7 +54,7 @@ export class Client {
 
 		model.change( writer => {
 			// Replace existing model in document by new one.
-			writer.remove( Range._createIn( modelRoot ) );
+			writer.remove( writer.createRangeIn( modelRoot ) );
 			writer.insert( modelDocumentFragment, modelRoot );
 		} );
 

+ 2 - 2
packages/ckeditor5-engine/tests/view/downcastwriter/move.js

@@ -204,11 +204,11 @@ describe( 'DowncastWriter', () => {
 
 			expect( mapper.markerNameToElements( 'foo' ).size ).to.equal( 2 );
 
-			writer.remove( Range._createOn( attrElemA ) );
+			writer.remove( writer.createRangeOn( attrElemA ) );
 
 			expect( mapper.markerNameToElements( 'foo' ).size ).to.equal( 1 );
 
-			writer.move( Range._createOn( attrElemB ), new Position( dstContainer, 0 ) );
+			writer.move( writer.createRangeOn( attrElemB ), new Position( dstContainer, 0 ) );
 
 			expect( mapper.markerNameToElements( 'foo' ).size ).to.equal( 1 );
 		} );

+ 9 - 9
packages/ckeditor5-engine/tests/view/downcastwriter/unwrap.js

@@ -378,7 +378,7 @@ describe( 'DowncastWriter', () => {
 			const attribute = writer.createAttributeElement( 'span', null, { id: 'foo' } );
 			const container = writer.createContainerElement( 'div' );
 
-			writer.insert( Position._createAt( container, 0 ), attribute );
+			writer.insert( writer.createPositionAt( container, 0 ), attribute );
 			writer.unwrap( Range._createOn( attribute ), unwrapper );
 
 			expect( stringify( container, null, { showType: false, showPriority: false } ) ).to.equal( '<div></div>' );
@@ -389,8 +389,8 @@ describe( 'DowncastWriter', () => {
 			const attribute = writer.createAttributeElement( 'span', { foo: 'foo' }, { id: 'foo' } );
 			const container = writer.createContainerElement( 'div' );
 
-			writer.insert( Position._createAt( container, 0 ), attribute );
-			writer.unwrap( Range._createOn( attribute ), unwrapper );
+			writer.insert( writer.createPositionAt( container, 0 ), attribute );
+			writer.unwrap( writer.createRangeOn( attribute ), unwrapper );
 
 			expect( stringify( container, null, { showType: false, showPriority: false } ) ).to.equal( '<div></div>' );
 		} );
@@ -403,8 +403,8 @@ describe( 'DowncastWriter', () => {
 			const attribute = writer.createAttributeElement( 'span', { foo: 'foo', bar: 'bar' }, { id: 'id' } );
 			const container = writer.createContainerElement( 'div' );
 
-			writer.insert( Position._createAt( container, 0 ), attribute );
-			writer.unwrap( Range._createOn( attribute ), unwrapper );
+			writer.insert( writer.createPositionAt( container, 0 ), attribute );
+			writer.unwrap( writer.createRangeOn( attribute ), unwrapper );
 
 			const view = stringify( container, null, { showType: false, showPriority: false } );
 			expect( view ).to.equal( '<div><span bar="bar" foo="foo"></span></div>' );
@@ -415,8 +415,8 @@ describe( 'DowncastWriter', () => {
 			const attribute = writer.createAttributeElement( 'span', { foo: 'foo', bar: 'bar' } );
 			const container = writer.createContainerElement( 'div' );
 
-			writer.insert( Position._createAt( container, 0 ), attribute );
-			writer.unwrap( Range._createOn( attribute ), unwrapper );
+			writer.insert( writer.createPositionAt( container, 0 ), attribute );
+			writer.unwrap( writer.createRangeOn( attribute ), unwrapper );
 
 			const view = stringify( container, null, { showType: false, showPriority: false } );
 			expect( view ).to.equal( '<div><span bar="bar" foo="foo"></span></div>' );
@@ -427,8 +427,8 @@ describe( 'DowncastWriter', () => {
 			const attribute = writer.createAttributeElement( 'span', { foo: 'foo', bar: 'bar' }, { id: 'b' } );
 			const container = writer.createContainerElement( 'div' );
 
-			writer.insert( Position._createAt( container, 0 ), attribute );
-			writer.unwrap( Range._createOn( attribute ), unwrapper );
+			writer.insert( writer.createPositionAt( container, 0 ), attribute );
+			writer.unwrap( writer.createRangeOn( attribute ), unwrapper );
 
 			const view = stringify( container, null, { showType: false, showPriority: false } );
 			expect( view ).to.equal( '<div><span bar="bar" foo="foo"></span></div>' );

+ 2 - 3
packages/ckeditor5-engine/tests/view/manual/focusobserver.js

@@ -6,7 +6,6 @@
 /* globals console, document */
 
 import View from '../../../src/view/view';
-import Position from '../../../src/view/position';
 import createViewRoot from '../_utils/createroot';
 
 const view = new View();
@@ -31,8 +30,8 @@ viewDocument.on( 'selectionChange', ( evt, data ) => {
 } );
 
 view.change( writer => {
-	writer.insert( Position._createAt( editable1 ), writer.createText( 'First editable.' ) );
-	writer.insert( Position._createAt( editable2 ), writer.createText( 'Second editable.' ) );
+	writer.insert( writer.createPositionAt( editable1 ), writer.createText( 'First editable.' ) );
+	writer.insert( writer.createPositionAt( editable2 ), writer.createText( 'Second editable.' ) );
 
 	writer.setSelection( editable1 );
 } );

+ 1 - 2
packages/ckeditor5-engine/tests/view/manual/keyobserver.js

@@ -6,7 +6,6 @@
 /* globals console, document */
 
 import View from '../../../src/view/view';
-import Position from '../../../src/view/position';
 import createViewRoot from '../_utils/createroot';
 
 const view = new View();
@@ -20,7 +19,7 @@ view.attachDomRoot( document.getElementById( 'editable' ), 'editable' );
 
 view.change( writer => {
 	const text = writer.createText( 'foobar' );
-	writer.insert( Position._createAt( viewRoot ), text );
+	writer.insert( writer.createPositionAt( viewRoot ), text );
 	writer.setSelection( text, 3 );
 } );