8
0
Просмотр исходного кода

Fixed tests in whole repository after changes made to DomConverter.

Szymon Kupś 8 лет назад
Родитель
Сommit
cef54f21d5

+ 2 - 7
packages/ckeditor5-engine/src/view/domconverter.js

@@ -714,13 +714,8 @@ export default class DomConverter {
 		const previousSibling = viewText.previousSibling;
 
 		// Try to use previous sibling to find the corresponding text node.
-		if ( previousSibling ) {
-			const previousDomSibling = previousSibling.is( 'text' ) ?
-				this.findCorrespondingDomText( previousSibling ) : this.mapViewToDom( previousSibling );
-
-			if ( previousDomSibling ) {
-				return previousDomSibling.nextSibling;
-			}
+		if ( previousSibling && this.mapViewToDom( previousSibling ) ) {
+			return this.mapViewToDom( previousSibling ).nextSibling;
 		}
 
 		// If this is a first node, try to use parent to find the corresponding text node.

+ 3 - 3
packages/ckeditor5-engine/tests/controller/editingcontroller.js

@@ -66,7 +66,7 @@ describe( 'EditingController', () => {
 			expect( viewRoot ).to.equal( editing.view.getRoot() );
 			expect( domRoot ).to.equal( editing.view.getDomRoot() );
 
-			expect( editing.view.domConverter.getCorrespondingDom( viewRoot ) ).to.equal( domRoot );
+			expect( editing.view.domConverter.mapViewToDom( viewRoot ) ).to.equal( domRoot );
 			expect( editing.view.renderer.markedChildren.has( viewRoot ) ).to.be.true;
 
 			expect( editing.mapper.toModelElement( viewRoot ) ).to.equal( modelRoot );
@@ -81,7 +81,7 @@ describe( 'EditingController', () => {
 			expect( viewRoot ).to.equal( editing.view.getRoot( 'header' ) );
 			expect( domRoot ).to.equal( editing.view.getDomRoot( 'header' ) );
 
-			expect( editing.view.domConverter.getCorrespondingDom( viewRoot ) ).to.equal( domRoot );
+			expect( editing.view.domConverter.mapViewToDom( viewRoot ) ).to.equal( domRoot );
 			expect( editing.view.renderer.markedChildren.has( viewRoot ) ).to.be.true;
 
 			expect( editing.mapper.toModelElement( viewRoot ) ).to.equal( model.getRoot( 'header' ) );
@@ -100,7 +100,7 @@ describe( 'EditingController', () => {
 
 			expect( domRoot ).to.equal( editing.view.getDomRoot() );
 
-			expect( editing.view.domConverter.getCorrespondingDom( viewRoot ) ).to.equal( domRoot );
+			expect( editing.view.domConverter.mapViewToDom( viewRoot ) ).to.equal( domRoot );
 			expect( editing.view.renderer.markedChildren.has( viewRoot ) ).to.be.true;
 
 			expect( editing.mapper.toModelElement( viewRoot ) ).to.equal( modelRoot );