瀏覽代碼

Remove ViewRange import from downcast-converts.

Maciej Gołaszewski 7 年之前
父節點
當前提交
83108ceb54
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      packages/ckeditor5-engine/src/conversion/downcast-converters.js

+ 4 - 5
packages/ckeditor5-engine/src/conversion/downcast-converters.js

@@ -8,7 +8,6 @@ import ModelSelection from '../model/selection';
 import ModelElement from '../model/element';
 
 import ViewAttributeElement from '../view/attributeelement';
-import ViewRange from '../view/range';
 import DocumentSelection from '../model/documentselection';
 
 import { cloneDeep } from 'lodash-es';
@@ -533,14 +532,14 @@ export function remove() {
 		const modelEnd = data.position.getShiftedBy( data.length );
 		const viewEnd = conversionApi.mapper.toViewPosition( modelEnd, { isPhantom: true } );
 
-		const viewRange = new ViewRange( viewStart, viewEnd );
+		const viewRange = conversionApi.writer.createRange( viewStart, viewEnd );
 
 		// Trim the range to remove in case some UI elements are on the view range boundaries.
 		const removed = conversionApi.writer.remove( viewRange.getTrimmed() );
 
 		// After the range is removed, unbind all view elements from the model.
 		// Range inside view document fragment is used to unbind deeply.
-		for ( const child of ViewRange._createIn( removed ).getItems() ) {
+		for ( const child of conversionApi.writer.createRangeIn( removed ).getItems() ) {
 			conversionApi.mapper.unbindViewElement( child );
 		}
 	};
@@ -626,7 +625,7 @@ export function removeUIElement() {
 		conversionApi.mapper.unbindElementsFromMarkerName( data.markerName );
 
 		for ( const element of elements ) {
-			conversionApi.writer.clear( ViewRange._createOn( element ), element );
+			conversionApi.writer.clear( conversionApi.writer.createRangeOn( element ), element );
 		}
 
 		conversionApi.writer.clearClonedElementsGroup( data.markerName );
@@ -963,7 +962,7 @@ export function removeHighlight( highlightDescriptor ) {
 
 		for ( const element of elements ) {
 			if ( element.is( 'attributeElement' ) ) {
-				conversionApi.writer.unwrap( ViewRange._createOn( element ), viewHighlightElement );
+				conversionApi.writer.unwrap( conversionApi.writer.createRangeOn( element ), viewHighlightElement );
 			} else {
 				// if element.is( 'containerElement' ).
 				element.getCustomProperty( 'removeHighlight' )( element, descriptor.id, conversionApi.writer );