Przeglądaj źródła

Aligned code fragments to new Selection constructor.

Maciej Bukowski 7 lat temu
rodzic
commit
69638a9875

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

@@ -185,11 +185,9 @@ export function stringify( node, selectionOrPositionOrRange = null ) {
 	} else if ( selectionOrPositionOrRange instanceof DocumentSelection ) {
 		selection = selectionOrPositionOrRange;
 	} else if ( selectionOrPositionOrRange instanceof ModelRange ) {
-		selection = new ModelSelection();
-		selection.setTo( selectionOrPositionOrRange );
+		selection = new ModelSelection( selectionOrPositionOrRange );
 	} else if ( selectionOrPositionOrRange instanceof ModelPosition ) {
-		selection = new ModelSelection();
-		selection.setTo( selectionOrPositionOrRange );
+		selection = new ModelSelection( selectionOrPositionOrRange );
 	}
 
 	// Setup model to view converter.
@@ -294,18 +292,15 @@ export function parse( data, schema, options = {} ) {
 
 		// Convert ranges.
 		for ( const viewRange of viewSelection.getRanges() ) {
-			ranges.push( ( mapper.toModelRange( viewRange ) ) );
+			ranges.push( mapper.toModelRange( viewRange ) );
 		}
 
 		// Create new selection.
-		selection = new ModelSelection();
-		selection.setTo( ranges, viewSelection.isBackward );
+		selection = new ModelSelection( ranges, viewSelection.isBackward );
 
 		// Set attributes to selection if specified.
-		if ( options.selectionAttributes ) {
-			for ( const [ key, value ] of toMap( options.selectionAttributes ) ) {
-				selection.setAttribute( key, value );
-			}
+		for ( const [ key, value ] of toMap( options.selectionAttributes || [] ) ) {
+			selection.setAttribute( key, value );
 		}
 	}
 

+ 7 - 8
packages/ckeditor5-engine/src/dev-utils/view.js

@@ -125,8 +125,9 @@ setData._parse = parse;
  *		const text = new Text( 'foobar' );
  *		const b = new Element( 'b', null, text );
  *		const p = new Element( 'p', null, b );
- *		const selection = new Selection();
- *		selection.setTo( Range.createFromParentsAndOffsets( p, 0, p, 1 ) );
+ *		const selection = new Selection(
+ *			Range.createFromParentsAndOffsets( p, 0, p, 1 )
+ *		);
  *
  *		stringify( p, selection ); // '<p>[<b>foobar</b>]</p>'
  *
@@ -135,7 +136,7 @@ setData._parse = parse;
  *		const text = new Text( 'foobar' );
  *		const b = new Element( 'b', null, text );
  *		const p = new Element( 'p', null, b );
- *		const selection = new Selection( [ Range.createFromParentsAndOffsets( text, 1, text, 5 ) ] );
+ *		const selection = new Selection( Range.createFromParentsAndOffsets( text, 1, text, 5 ) );
  *
  *		stringify( p, selection ); // '<p><b>f{ooba}r</b></p>'
  *
@@ -146,9 +147,8 @@ setData._parse = parse;
  * Multiple ranges are supported:
  *
  *		const text = new Text( 'foobar' );
- *		const selection = new Selection();
- *		selection.setTo( [
-	 		Range.createFromParentsAndOffsets( text, 0, text, 1 ) ),
+ *		const selection = new Selection( [
+ *			Range.createFromParentsAndOffsets( text, 0, text, 1 ) ),
  *			Range.createFromParentsAndOffsets( text, 3, text, 5 ) )
  *		] );
  *
@@ -214,8 +214,7 @@ export function stringify( node, selectionOrPositionOrRange = null, options = {}
 		selectionOrPositionOrRange instanceof Position ||
 		selectionOrPositionOrRange instanceof Range
 	) {
-		selection = new Selection();
-		selection.setTo( selectionOrPositionOrRange );
+		selection = new Selection( selectionOrPositionOrRange );
 	} else {
 		selection = selectionOrPositionOrRange;
 	}

+ 1 - 2
packages/ckeditor5-engine/tests/model/utils/insertcontent.js

@@ -39,8 +39,7 @@ describe( 'DataController utils', () => {
 			model.schema.extend( '$text', { allowIn: '$root' } );
 			setData( model, 'a[]bc' );
 
-			const selection = new Selection();
-			selection.setTo( new Position( doc.getRoot(), [ 2 ] ) );
+			const selection = new Selection( new Position( doc.getRoot(), [ 2 ] ) );
 
 			model.change( () => {
 				insertContent( model, new Text( 'x' ), selection );

+ 1 - 2
packages/ckeditor5-engine/tests/view/domconverter/binding.js

@@ -270,8 +270,7 @@ describe( 'DomConverter', () => {
 		beforeEach( () => {
 			viewElement = new ViewElement();
 			domEl = document.createElement( 'div' );
-			selection = new ViewSelection();
-			selection.setTo( ViewRange.createIn( viewElement ) );
+			selection = new ViewSelection( ViewRange.createIn( viewElement ) );
 			converter.bindFakeSelection( domEl, selection );
 		} );
 

+ 2 - 4
packages/ckeditor5-engine/tests/view/domconverter/dom-to-view.js

@@ -859,8 +859,7 @@ describe( 'DomConverter', () => {
 			domContainer.innerHTML = 'fake selection container';
 			document.body.appendChild( domContainer );
 
-			const viewSelection = new ViewSelection();
-			viewSelection.setTo( ViewRange.createIn( new ViewElement() ) );
+			const viewSelection = new ViewSelection( ViewRange.createIn( new ViewElement() ) );
 			converter.bindFakeSelection( domContainer, viewSelection );
 
 			const domRange = document.createRange();
@@ -881,8 +880,7 @@ describe( 'DomConverter', () => {
 			domContainer.innerHTML = 'fake selection container';
 			document.body.appendChild( domContainer );
 
-			const viewSelection = new ViewSelection();
-			viewSelection.setTo( ViewRange.createIn( new ViewElement() ) );
+			const viewSelection = new ViewSelection( ViewRange.createIn( new ViewElement() ) );
 			converter.bindFakeSelection( domContainer, viewSelection );
 
 			const domRange = document.createRange();