Merge 5efc8e6 into 71c4c19

ckeditor · Nov 21, 2018 · b26c0bc · b26c0bc
2 parents 71c4c19 + 5efc8e6
commit b26c0bc
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/tests/manual/highlight.js b/tests/manual/highlight.js
@@ -48,7 +48,7 @@ class FancyWidget extends Plugin {
 			model: 'fancywidget',
 			view: ( modelItem, viewWriter ) => {
 				const widgetElement = viewWriter.createContainerElement( 'figure', { class: 'fancy-widget' } );
-				viewWriter.insert( viewWriter.createPositionAt( widgetElement ), viewWriter.createText( 'widget' ) );
+				viewWriter.insert( viewWriter.createPositionAt( widgetElement, 0 ), viewWriter.createText( 'widget' ) );
 
 				return toWidget( widgetElement, viewWriter );
 			}

diff --git a/tests/manual/selection.html b/tests/manual/selection.html
@@ -45,4 +45,4 @@
 	<p>baz</p>
 </div>
 <h2>Model contents:</h2>
-<div id="model"></div>
+<pre id="model"></pre>
diff --git a/tests/manual/tickets/ckeditor5-721/1.js b/tests/manual/tickets/ckeditor5-721/1.js
@@ -47,7 +47,7 @@ ClassicEditor
 					const b = writer.createAttributeElement( 'b' );
 					const div = writer.createContainerElement( 'div' );
 
-					writer.insert( ViewPosition._createAt( div ), b );
+					writer.insert( ViewPosition._createAt( div, 0 ), b );
 
 					return toWidget( div, writer, { label: 'element label' } );
 				}

diff --git a/tests/view/manual/focus.js b/tests/view/manual/focus.js
@@ -28,8 +28,8 @@ view.change( writer => {
 	text1 = writer.createText( 'Foo bar baz' );
 	text2 = writer.createText( 'Foo bar baz' );
 
-	writer.insert( ViewPosition._createAt( editable1 ), text1 );
-	writer.insert( ViewPosition._createAt( editable2 ), text2 );
+	writer.insert( ViewPosition._createAt( editable1, 0 ), text1 );
+	writer.insert( ViewPosition._createAt( editable2, 0 ), text2 );
 } );
 
 document.getElementById( 'button1' ).addEventListener( 'click', () => {

diff --git a/tests/view/manual/focusobserver.js b/tests/view/manual/focusobserver.js
@@ -30,10 +30,10 @@ viewDocument.on( 'selectionChange', ( evt, data ) => {
 } );
 
 view.change( writer => {
-	writer.insert( writer.createPositionAt( editable1 ), writer.createText( 'First editable.' ) );
-	writer.insert( writer.createPositionAt( editable2 ), writer.createText( 'Second editable.' ) );
+	writer.insert( writer.createPositionAt( editable1, 0 ), writer.createText( 'First editable.' ) );
+	writer.insert( writer.createPositionAt( editable2, 0 ), writer.createText( 'Second editable.' ) );
 
-	writer.setSelection( editable1 );
+	writer.setSelection( editable1, 'end' );
 } );
 
 editable1.on( 'change:isFocused', () => {

diff --git a/tests/view/manual/keyobserver.js b/tests/view/manual/keyobserver.js
@@ -19,7 +19,7 @@ view.attachDomRoot( document.getElementById( 'editable' ), 'editable' );
 
 view.change( writer => {
 	const text = writer.createText( 'foobar' );
-	writer.insert( writer.createPositionAt( viewRoot ), text );
+	writer.insert( writer.createPositionAt( viewRoot, 0 ), text );
 	writer.setSelection( text, 3 );
 } );
 

diff --git a/tests/view/manual/noselection-iframe.html b/tests/view/manual/noselection-iframe.html
@@ -1,2 +1 @@
-<div contenteditable="true" id="editor"></div>
 <iframe id="iframe" src="immutable.html"></iframe>
diff --git a/tests/view/manual/noselection-iframe.js b/tests/view/manual/noselection-iframe.js
@@ -9,12 +9,18 @@ import View from '../../../src/view/view';
 import { setData } from '../../../src/dev-utils/view';
 import createViewRoot from '../_utils/createroot';
 
-const view = new View();
-const viewDocument = view.document;
-createViewRoot( viewDocument );
 const iframe = document.getElementById( 'iframe' );
-view.attachDomRoot( iframe.contentWindow.document.getElementById( 'editor' ) );
+iframe.srcdoc = '<div contenteditable="true" id="editor"></div>';
 
-setData( view,
-	'<container:p>foo</container:p>' +
-	'<container:p>bar</container:p>' );
+iframe.addEventListener( 'load', () => {
+	const view = new View();
+	const viewDocument = view.document;
+	createViewRoot( viewDocument );
+
+	view.attachDomRoot( iframe.contentWindow.document.getElementById( 'editor' ) );
+
+	setData( view,
+		'<container:p>foo</container:p>' +
+		'<container:p>bar</container:p>'
+	);
+} );