Merge t/ckeditor5-engine/1208

Other: Aligned code to the changes in the engine.
ckeditor · Dec 26, 2017 · 6ae5c6a · 6ae5c6a
2 parents d72ff0e + c1c09bd
commit 6ae5c6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/converters.js b/src/converters.js
@@ -737,7 +737,7 @@ function _fixItemsType( changePosition, model, batch ) {
  *		<listItem type="bulleted" indent=2>C</listItem>
  *
  * @param {module:utils/eventinfo~EventInfo} evt An object containing information about the fired event.
- * @param {Array} args Arguments of {@link module:engine/controller/datacontroller~DataController#insertContent}.
+ * @param {Array} args Arguments of {@link module:engine/model/model~Model#insertContent}.
  */
 export function modelIndentPasteFixer( evt, [ content, selection ] ) {
 	// Check whether inserted content starts from a `listItem`. If it does not, it means that there are some other

diff --git a/src/listengine.js b/src/listengine.js
@@ -67,7 +67,7 @@ export default class ListEngine extends Plugin {
 		const data = editor.data;
 		const editing = editor.editing;
 
-		this.editor.model.document.on( 'change', modelChangePostFixer( this.editor.model ), { priority: 'high' } );
+		editor.model.document.on( 'change', modelChangePostFixer( editor.model ), { priority: 'high' } );
 
 		editing.mapper.registerViewToModelLength( 'li', getViewListItemLength );
 		data.mapper.registerViewToModelLength( 'li', getViewListItemLength );
@@ -97,7 +97,7 @@ export default class ListEngine extends Plugin {
 		data.viewToModel.on( 'element:li', viewModelConverter );
 
 		// Fix indentation of pasted items.
-		data.on( 'insertContent', modelIndentPasteFixer, { priority: 'high' } );
+		editor.model.on( 'insertContent', modelIndentPasteFixer, { priority: 'high' } );
 
 		// Register commands for numbered and bulleted list.
 		editor.commands.add( 'numberedList', new ListCommand( editor, 'numbered' ) );

diff --git a/tests/listengine.js b/tests/listengine.js
@@ -3061,7 +3061,7 @@ describe( 'ListEngine', () => {
 				'<listItem type="bulleted" indent="2">C</listItem>'
 			);
 
-			editor.data.insertContent(
+			editor.model.insertContent(
 				parseModel(
 					'<listItem type="bulleted" indent="0">X</listItem>' +
 					'<listItem type="bulleted" indent="1">Y</listItem>',
@@ -3086,7 +3086,7 @@ describe( 'ListEngine', () => {
 				'<listItem type="bulleted" indent="2">C</listItem>'
 			);
 
-			editor.data.insertContent(
+			editor.model.insertContent(
 				new ModelElement( 'listItem', { type: 'bulleted', indent: '0' }, 'X' ),
 				modelDoc.selection
 			);
@@ -3106,7 +3106,7 @@ describe( 'ListEngine', () => {
 				'<listItem type="bulleted" indent="2">C</listItem>'
 			);
 
-			editor.data.insertContent(
+			editor.model.insertContent(
 				new ModelText( 'X' ),
 				modelDoc.selection
 			);
@@ -3247,7 +3247,7 @@ describe( 'ListEngine', () => {
 			setModelData( model, '<paragraph>[]</paragraph>' );
 
 			expect( () => {
-				editor.data.insertContent( new ModelDocumentFragment(), modelDoc.selection );
+				editor.model.insertContent( new ModelDocumentFragment(), modelDoc.selection );
 			} ).not.to.throw();
 		} );