Merge branch t/ckeditor5-engine/1554

Internal: Aligned code to changes in the engine. See ckeditor/ckeditor5-engine#1554.
ckeditor · Oct 26, 2018 · 3d2ea98 · 3d2ea98
2 parents abccef4 + ef8f6a5
commit 3d2ea98
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/converters.js b/src/converters.js
@@ -381,7 +381,7 @@ export function viewModelConverter( evt, data, conversionApi ) {
 		// When modelCursor parent had to be split to insert list item.
 		if ( splitResult.cursorParent ) {
 			// Then continue conversion in split element.
-			data.modelCursor = ModelPosition.createAt( splitResult.cursorParent );
+			data.modelCursor = ModelPosition.createAt( splitResult.cursorParent, 0 );
 		} else {
 			// Otherwise continue conversion after last list item.
 			data.modelCursor = data.modelRange.end;
@@ -792,7 +792,7 @@ function generateLiInUl( modelItem, conversionApi ) {
 	const viewItem = createViewListItemElement( viewWriter );
 
 	const viewList = viewWriter.createContainerElement( listType, null );
-	viewWriter.insert( ViewPosition.createAt( viewList ), viewItem );
+	viewWriter.insert( ViewPosition.createAt( viewList, 0 ), viewItem );
 
 	mapper.bindElements( modelItem, viewItem );
 

diff --git a/tests/listcommand.js b/tests/listcommand.js
@@ -307,7 +307,7 @@ describe( 'ListCommand', () => {
 					// Command value=false, we are turning on list items.
 					model.change( writer => {
 						writer.setSelection( new Range(
-							Position.createAt( root.getChild( 2 ) ),
+							Position.createAt( root.getChild( 2 ), 0 ),
 							Position.createAt( root.getChild( 3 ), 'end' )
 						) );
 					} );
@@ -332,7 +332,7 @@ describe( 'ListCommand', () => {
 					// Command value=true, we are turning off list items.
 					model.change( writer => {
 						writer.setSelection( new Range(
-							Position.createAt( root.getChild( 1 ) ),
+							Position.createAt( root.getChild( 1 ), 0 ),
 							Position.createAt( root.getChild( 4 ), 'end' )
 						) );
 					} );
@@ -357,8 +357,8 @@ describe( 'ListCommand', () => {
 					// From first numbered lsit item to third bulleted list item.
 					model.change( writer => {
 						writer.setSelection( new Range(
-							Position.createAt( root.getChild( 4 ) ),
-							Position.createAt( root.getChild( 6 ) )
+							Position.createAt( root.getChild( 4 ), 0 ),
+							Position.createAt( root.getChild( 6 ), 0 )
 						) );
 					} );
 
@@ -382,7 +382,7 @@ describe( 'ListCommand', () => {
 					// From first numbered list item to third bulleted list item.
 					model.change( writer => {
 						writer.setSelection( new Range(
-							Position.createAt( root.getChild( 1 ) ),
+							Position.createAt( root.getChild( 1 ), 0 ),
 							Position.createAt( root.getChild( 5 ), 'end' )
 						) );
 					} );

diff --git a/tests/listediting.js b/tests/listediting.js
@@ -3960,7 +3960,7 @@ describe( 'ListEditing', () => {
 			it( 'ui element before <ul>', () => {
 				view.change( writer => {
 					// Append ui element before <ul>.
-					writer.insert( ViewPosition.createAt( viewRoot ), uiElement );
+					writer.insert( ViewPosition.createAt( viewRoot, 0 ), uiElement );
 				} );
 
 				model.change( writer => {
@@ -3974,7 +3974,7 @@ describe( 'ListEditing', () => {
 			it( 'ui element before first <li>', () => {
 				view.change( writer => {
 					// Append ui element before <ul>.
-					writer.insert( ViewPosition.createAt( viewRoot.getChild( 0 ) ), uiElement );
+					writer.insert( ViewPosition.createAt( viewRoot.getChild( 0 ), 0 ), uiElement );
 				} );
 
 				model.change( writer => {

diff --git a/tests/utils.js b/tests/utils.js
@@ -39,23 +39,23 @@ describe( 'utils', () => {
 				const innerListItem1 = createViewListItemElement( writer );
 
 				writer.insert(
-					ViewPosition.createAt( innerListItem1 ),
+					ViewPosition.createAt( innerListItem1, 0 ),
 					writer.createText( 'foo' )
 				);
 
 				const innerListItem2 = createViewListItemElement( writer );
 
 				writer.insert(
-					ViewPosition.createAt( innerListItem2 ),
+					ViewPosition.createAt( innerListItem2, 0 ),
 					writer.createText( 'bar' )
 				);
 
 				const innerList = writer.createContainerElement( 'ul' );
-				writer.insert( ViewPosition.createAt( innerList ), innerListItem1 );
-				writer.insert( ViewPosition.createAt( innerList ), innerListItem2 );
+				writer.insert( ViewPosition.createAt( innerList, 0 ), innerListItem1 );
+				writer.insert( ViewPosition.createAt( innerList, 0 ), innerListItem2 );
 
 				const outerListItem = createViewListItemElement( writer );
-				writer.insert( ViewPosition.createAt( outerListItem ), innerList );
+				writer.insert( ViewPosition.createAt( outerListItem, 0 ), innerList );
 
 				expect( outerListItem.getFillerOffset() ).to.equal( 0 );
 			} );
@@ -64,7 +64,7 @@ describe( 'utils', () => {
 				const item = createViewListItemElement( writer );
 
 				writer.insert(
-					ViewPosition.createAt( item ),
+					ViewPosition.createAt( item, 0 ),
 					writer.createText( 'foo' )
 				);