Added fixes to t/1209 after rebasing master.

ckeditor · Jan 21, 2018 · e78a083 · e78a083
1 parent 0991a41
commit e78a083
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/src/conversion/model-selection-to-view-converters.js b/src/conversion/model-selection-to-view-converters.js
@@ -3,11 +3,6 @@
  * For licensing, see LICENSE.md.
  */
 
-<<<<<<< HEAD
-import ViewRange from '../view/range';
-=======
-import ViewElement from '../view/element';
->>>>>>> Simplified setTo calls and used Writer API instead of DocumentSelection.
 import viewWriter from '../view/writer';
 
 /**

diff --git a/src/view/writer.js b/src/view/writer.js
@@ -496,7 +496,7 @@ export function wrap( range, attribute, viewSelection = null ) {
 
 		// If wrapping position is equal to view selection, move view selection inside wrapping attribute element.
 		if ( viewSelection && viewSelection.isCollapsed && viewSelection.getFirstPosition().isEqual( range.start ) ) {
-			viewSelection.setRanges( [ new Range( position ) ] );
+			viewSelection.setTo( new Range( position ) );
 		}
 
 		return new Range( position );

diff --git a/tests/controller/editingcontroller.js b/tests/controller/editingcontroller.js
@@ -372,7 +372,7 @@ describe( 'EditingController', () => {
 				writer.insert( modelData, modelRoot );
 				p1 = modelRoot.getChild( 0 );
 
-				model.document.selection.addRange( ModelRange.createFromParentsAndOffsets( p1, 0, p1, 0 ) );
+				model.document.selection.setTo( ModelRange.createFromParentsAndOffsets( p1, 0, p1, 0 ) );
 			} );
 
 			mcd = editing.modelToView;

diff --git a/tests/conversion/modelconversiondispatcher.js b/tests/conversion/modelconversiondispatcher.js
@@ -288,9 +288,9 @@ describe( 'ModelConversionDispatcher', () => {
 		} );
 
 		it( 'should fire attributes events for collapsed selection', () => {
-			doc.selection.setRanges( [
+			doc.selection.setTo(
 				new ModelRange( new ModelPosition( root, [ 2 ] ), new ModelPosition( root, [ 2 ] ) )
-			] );
+			);
 
 			model.change( writer => {
 				writer.setAttribute( 'bold', true, ModelRange.createIn( root ) );
@@ -304,9 +304,9 @@ describe( 'ModelConversionDispatcher', () => {
 		} );
 
 		it( 'should not fire attributes events if attribute has been consumed', () => {
-			doc.selection.setRanges( [
+			doc.selection.setTo(
 				new ModelRange( new ModelPosition( root, [ 2 ] ), new ModelPosition( root, [ 2 ] ) )
-			] );
+			);
 
 			model.change( writer => {
 				writer.setAttribute( 'bold', true, ModelRange.createIn( root ) );
@@ -325,9 +325,9 @@ describe( 'ModelConversionDispatcher', () => {
 		} );
 
 		it( 'should fire events for markers for collapsed selection', () => {
-			doc.selection.setRanges( [
+			doc.selection.setTo(
 				new ModelRange( new ModelPosition( root, [ 1 ] ), new ModelPosition( root, [ 1 ] ) )
-			] );
+			);
 
 			model.markers.set( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
 
@@ -392,9 +392,9 @@ describe( 'ModelConversionDispatcher', () => {
 		} );
 
 		it( 'should not fire events if information about marker has been consumed', () => {
-			doc.selection.setRanges( [
+			doc.selection.setTo(
 				new ModelRange( new ModelPosition( root, [ 1 ] ), new ModelPosition( root, [ 1 ] ) )
-			] );
+			);
 
 			model.markers.set( 'foo', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
 			model.markers.set( 'bar', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );