Sfoglia il codice sorgente

Merge branch 'master' into t/306

Oskar Wrobel 9 anni fa
parent
commit
6301385f40

+ 2 - 2
packages/ckeditor5-engine/src/conversion/modelconversiondispatcher.js

@@ -139,7 +139,7 @@ export default class ModelConversionDispatcher {
 		}
 
 		if ( type == 'insert' || type == 'reinsert' ) {
-			this.convertInsert( data.range );
+			this.convertInsertion( data.range );
 		} else if ( type == 'move' ) {
 			this.convertMove( data.sourcePosition, data.range );
 		} else if ( type == 'remove' ) {
@@ -159,7 +159,7 @@ export default class ModelConversionDispatcher {
 	 * @fires engine.conversion.ModelConversionDispatcher#addAttribute
 	 * @param {engine.model.Range} range Inserted range.
 	 */
-	convertInsert( range ) {
+	convertInsertion( range ) {
 		// Create a list of things that can be consumed, consisting of nodes and their attributes.
 		const consumable = this._createInsertConsumable( range );
 

+ 1 - 1
packages/ckeditor5-engine/src/datacontroller.js

@@ -123,7 +123,7 @@ export default class DataController {
 		const viewDocumentFragment = new ViewDocumentFragment();
 		this._mapper.bindElements( modelRoot, viewDocumentFragment );
 
-		this.modelToView.convertInsert( modelRange );
+		this.modelToView.convertInsertion( modelRange );
 
 		this._mapper.clearBindings();
 

+ 4 - 4
packages/ckeditor5-engine/src/model/range.js

@@ -541,13 +541,13 @@ export default class Range {
 	}
 
 	/**
-	 * Creates a range that starts before given {@link engine.model.Node node} and ends after it.
+	 * Creates a range that starts before given {@link engine.model.Item model item} and ends after it.
 	 *
-	 * @param {engine.model.Node} node
+	 * @param {engine.model.Item} item
 	 * @returns {engine.model.Range}
 	 */
-	static createOn( node ) {
-		return this.createFromPositionAndShift( Position.createBefore( node ), node.offsetSize );
+	static createOn( item ) {
+		return this.createFromPositionAndShift( Position.createBefore( item ), item.offsetSize );
 	}
 
 	/**

+ 4 - 4
packages/ckeditor5-engine/src/view/range.js

@@ -336,12 +336,12 @@ export default class Range {
 	}
 
 	/**
-	 * Creates a range that starts before given {@link engine.view.Node node} and ends after it.
+	 * Creates a range that starts before given {@link engine.view.Item view item} and ends after it.
 	 *
-	 * @param {engine.view.Node} node
+	 * @param {engine.view.Item} item
 	 * @returns {engine.view.Range}
 	 */
-	static createOn( node ) {
-		return this.createFromPositionAndShift( Position.createBefore( node ), 1 );
+	static createOn( item ) {
+		return this.createFromPositionAndShift( Position.createBefore( item ), 1 );
 	}
 }

+ 1 - 1
packages/ckeditor5-engine/tests/_utils/model.js

@@ -199,7 +199,7 @@ export function stringify( node, selectionOrPositionOrRange = null ) {
 	modelToView.on( 'selection', convertCollapsedSelection(), 'lowest' );
 
 	// Convert model to view.
-	modelToView.convertInsert( range );
+	modelToView.convertInsertion( range );
 
 	// Convert model selection to view selection.
 	if ( selection ) {

+ 6 - 6
packages/ckeditor5-engine/tests/conversion/advanced-converters.js

@@ -254,7 +254,7 @@ describe( 'image with caption converters', () => {
 	it( 'should convert model images changes without caption to view', () => {
 		let modelElement = new ModelElement( 'image', { src: 'bar.jpg', title: 'bar' } );
 		modelRoot.appendChildren( modelElement );
-		modelDispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		modelDispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><img src="bar.jpg" title="bar"></img></div>' );
 
@@ -271,7 +271,7 @@ describe( 'image with caption converters', () => {
 			new ModelElement( 'caption', {}, new ModelText( 'foobar' ) )
 		] );
 		modelRoot.appendChildren( modelElement );
-		modelDispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		modelDispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal(
 			'<div><figure><img src="foo.jpg" title="foo"></img><figcaption>foobar</figcaption></figure></div>'
@@ -483,7 +483,7 @@ describe( 'custom attribute handling for given element', () => {
 
 		let range = ModelRange.createIn( modelRoot );
 
-		modelDispatcher.convertInsert( range );
+		modelDispatcher.convertInsertion( range );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><a href="foo.html" title="Foo title">foo</a></div>' );
 
@@ -533,7 +533,7 @@ describe( 'custom attribute handling for given element', () => {
 	it( 'should convert quote model element with linkHref and linkTitle attribute to view', () => {
 		let modelElement = new ModelElement( 'quote', { linkHref: 'foo.html', linkTitle: 'Foo source' }, new ModelText( 'foo' ) );
 		modelRoot.appendChildren( modelElement );
-		modelDispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		modelDispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		let expected = '<div><blockquote>foo<a href="foo.html" title="Foo source">see source</a></blockquote></div>';
 		expect( viewToString( viewRoot ) ).to.equal( expected );
@@ -543,7 +543,7 @@ describe( 'custom attribute handling for given element', () => {
 		modelDispatcher.on( 'removeAttribute:bold', unwrap( new ViewAttributeElement( 'strong' ) ) );
 
 		modelElement.appendChildren( new ModelText( 'bar', { bold: true } ) );
-		modelDispatcher.convertInsert( ModelRange.createFromParentsAndOffsets( modelElement, 3, modelElement, 6 ) );
+		modelDispatcher.convertInsertion( ModelRange.createFromParentsAndOffsets( modelElement, 3, modelElement, 6 ) );
 
 		expected = '<div><blockquote>foo<strong>bar</strong><a href="foo.html" title="Foo source">see source</a></blockquote></div>';
 		expect( viewToString( viewRoot ) ).to.equal( expected );
@@ -718,7 +718,7 @@ describe( 'universal converter', () => {
 		] );
 
 		modelRoot.appendChildren( modelElement );
-		modelDispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		modelDispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal(
 			'<div>' +

+ 13 - 13
packages/ckeditor5-engine/tests/conversion/buildmodelconverter.js

@@ -99,7 +99,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'paragraph', null, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
 		} );
@@ -110,7 +110,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'image' );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><img></img></div>' );
 		} );
@@ -123,7 +123,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'header', { level: 2 }, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><h2>foobar</h2></div>' );
 		} );
@@ -140,7 +140,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelText( 'foo', { bold: true } );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><strong>foo</strong></div>' );
 
@@ -157,7 +157,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelText( 'foo', { bold: true } );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><strong>foo</strong></div>' );
 
@@ -174,7 +174,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelText( 'foo', { italic: 'em' } );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><em>foo</em></div>' );
 
@@ -207,7 +207,7 @@ describe( 'Model converter builder', () => {
 			modelDoc.selection._updateAttributes();
 
 			// Convert stuff.
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 			dispatcher.convertSelection( modelDoc.selection );
 
 			// Check if view structure is ok.
@@ -266,7 +266,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'paragraph', { class: 'myClass' }, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><p class="myClass">foobar</p></div>' );
 
@@ -287,7 +287,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'paragraph', { theme: 'abc' }, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><p class="abc">foobar</p></div>' );
 
@@ -308,7 +308,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'paragraph', { 'highlighted': true }, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><p style="background:yellow;">foobar</p></div>' );
 
@@ -326,7 +326,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'paragraph', { theme: 'nice' }, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><p class="nice-theme">foobar</p></div>' );
 
@@ -350,7 +350,7 @@ describe( 'Model converter builder', () => {
 			let modelElement = new ModelElement( 'custom', null, new ModelText( 'foobar' ) );
 			modelRoot.appendChildren( modelElement );
 
-			dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+			dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 			expect( viewToString( viewRoot ) ).to.equal( '<div><other>foobar</other></div>' );
 		} );
@@ -366,7 +366,7 @@ describe( 'Model converter builder', () => {
 		let modelElement = new ModelElement( 'div', null, new ModelElement( 'paragraph', null, new ModelText( 'foobar' ) ) );
 		modelRoot.appendChildren( modelElement );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><div><p>foobar</p></div></div>' );
 	} );

+ 1 - 1
packages/ckeditor5-engine/tests/conversion/model-selection-to-view-converters.js

@@ -502,7 +502,7 @@ function test( selectionPaths, modelInput, expectedView, selectionAttributes = {
 	viewRoot.removeChildren( 0, viewRoot.childCount );
 
 	// Convert model to view.
-	dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+	dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 	dispatcher.convertSelection( modelSelection );
 
 	// Stringify view and check if it is same as expected.

+ 14 - 14
packages/ckeditor5-engine/tests/conversion/model-to-view-converters.js

@@ -83,7 +83,7 @@ describe( 'insertText', () => {
 		modelRoot.appendChildren( new ModelText( 'foobar' ) );
 		dispatcher.on( 'insert:$text', insertText() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div>foobar</div>' );
 	} );
@@ -92,7 +92,7 @@ describe( 'insertText', () => {
 		modelRoot.appendChildren( new ModelText( 'நிலைக்கு' ) );
 		dispatcher.on( 'insert:$text', insertText() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div>நிலைக்கு</div>' );
 	} );
@@ -107,7 +107,7 @@ describe( 'insertElement', () => {
 		dispatcher.on( 'insert:paragraph', insertElement( viewElement ) );
 		dispatcher.on( 'insert:$text', insertText() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
 	} );
@@ -128,7 +128,7 @@ describe( 'insertElement', () => {
 		dispatcher.on( 'insert:myParagraph', insertElement( elementGenerator ) );
 		dispatcher.on( 'insert:$text', insertText() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><div>foo</div><p>bar</p></div>' );
 	} );
@@ -146,7 +146,7 @@ describe( 'setAttribute/removeAttribute', () => {
 		dispatcher.on( 'changeAttribute:class', setAttribute() );
 		dispatcher.on( 'removeAttribute:class', removeAttribute() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p class="foo">foobar</p></div>' );
 
@@ -181,7 +181,7 @@ describe( 'setAttribute/removeAttribute', () => {
 		dispatcher.on( 'changeAttribute:theme', setAttribute( themeConverter ) );
 		dispatcher.on( 'removeAttribute:theme', removeAttribute( themeConverter ) );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p class="nice fix-content">foobar</p><div class="nice"></div></div>' );
 
@@ -209,7 +209,7 @@ describe( 'wrap/unwrap', () => {
 		dispatcher.on( 'addAttribute:bold', wrap( viewB ) );
 		dispatcher.on( 'removeAttribute:bold', unwrap( viewB ) );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p><b>foobar</b></p></div>' );
 
@@ -236,7 +236,7 @@ describe( 'wrap/unwrap', () => {
 		dispatcher.on( 'addAttribute:style', wrap( elementGenerator ) );
 		dispatcher.on( 'removeAttribute:style', unwrap( elementGenerator ) );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p><b>foobar</b></p></div>' );
 
@@ -264,7 +264,7 @@ describe( 'wrap/unwrap', () => {
 		dispatcher.on( 'addAttribute:link', wrap( elementGenerator ) );
 		dispatcher.on( 'changeAttribute:link', wrap( elementGenerator ) );
 
-		dispatcher.convertInsert(
+		dispatcher.convertInsertion(
 			ModelRange.createIn( modelRoot )
 		);
 
@@ -294,7 +294,7 @@ describe( 'wrap/unwrap', () => {
 		dispatcher.on( 'addAttribute:bold', wrap( viewB ) );
 		dispatcher.on( 'removeAttribute:bold', unwrap( viewB ) );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		expect( viewToString( viewRoot ) ).to.equal( '<div><p>நி<b>லைக்</b>கு</p></div>' );
 
@@ -322,7 +322,7 @@ describe( 'move', () => {
 		dispatcher.on( 'insert:$text', insertText() );
 		dispatcher.on( 'move', move() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		const removedNodes = modelDivA.removeChildren( 0, 2 );
 		modelDivB.insertChildren( 0, removedNodes );
@@ -344,7 +344,7 @@ describe( 'move', () => {
 		dispatcher.on( 'insert:$text', insertText() );
 		dispatcher.on( 'move', move() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		modelWriter.move(
 			ModelRange.createFromParentsAndOffsets( modelDivA, 2, modelDivA, 6 ),
@@ -374,7 +374,7 @@ describe( 'remove', () => {
 		dispatcher.on( 'insert:$text', insertText() );
 		dispatcher.on( 'remove', remove() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		const removedNodes = modelDiv.removeChildren( 0, 2 );
 		modelDoc.graveyard.insertChildren( 0, removedNodes );
@@ -395,7 +395,7 @@ describe( 'remove', () => {
 		dispatcher.on( 'insert:$text', insertText() );
 		dispatcher.on( 'remove', remove() );
 
-		dispatcher.convertInsert( ModelRange.createIn( modelRoot ) );
+		dispatcher.convertInsertion( ModelRange.createIn( modelRoot ) );
 
 		modelWriter.move(
 			ModelRange.createFromParentsAndOffsets( modelDiv, 0, modelDiv, 6 ),

+ 2 - 2
packages/ckeditor5-engine/tests/conversion/modelconversiondispatcher.js

@@ -233,7 +233,7 @@ describe( 'ModelConversionDispatcher', () => {
 				expect( consumable.consume( data.item, 'addAttribute:' + key ) ).to.be.true;
 			} );
 
-			dispatcher.convertInsert( range );
+			dispatcher.convertInsertion( range );
 
 			// Check the data passed to called events and the order of them.
 			expect( loggedEvents ).to.deep.equal( [
@@ -264,7 +264,7 @@ describe( 'ModelConversionDispatcher', () => {
 
 			const range = ModelRange.createIn( root );
 
-			dispatcher.convertInsert( range );
+			dispatcher.convertInsertion( range );
 
 			expect( dispatcher.fire.calledWith( 'insert:image' ) ).to.be.true;
 			expect( dispatcher.fire.calledWith( 'addAttribute:src:image' ) ).to.be.true;