8
0
Piotr Jasiun 9 лет назад
Родитель
Сommit
4666109743

+ 1 - 1
packages/ckeditor5-engine/src/view/document.js

@@ -167,7 +167,7 @@ export default class Document {
 			this.renderer.markToSync( type, node );
 		} );
 
-		if ( domRoot instanceof Element ) {
+		if ( domRoot instanceof HTMLElement ) {
 			this.attachDomRoot( domRoot, name );
 		}
 

+ 5 - 6
packages/ckeditor5-engine/tests/view/document/document.js

@@ -63,24 +63,23 @@ describe( 'Document', () => {
 		it( 'should create root', () => {
 			const domP = document.createElement( 'p' );
 			const domDiv = document.createElement( 'div' );
-			domDiv.setAttribute( 'id', 'editor' );
 			domDiv.appendChild( domP );
 
 			const viewDocument = new Document();
-			const ret = viewDocument.createRoot( domDiv, 'editor' );
+			const ret = viewDocument.createRoot( domDiv );
 
 			expect( count( viewDocument.domRoots ) ).to.equal( 1 );
 			expect( count( viewDocument.viewRoots ) ).to.equal( 1 );
 
-			const domRoot = viewDocument.domRoots.get( 'editor' );
-			const viewRoot = viewDocument.viewRoots.get( 'editor' );
+			const domRoot = viewDocument.getDomRoot();
+			const viewRoot = viewDocument.getRoot();
 
 			expect( ret ).to.equal( viewRoot );
 
 			expect( domRoot ).to.equal( domDiv );
 			expect( viewDocument.domConverter.getCorrespondingDom( viewRoot ) ).to.equal( domDiv );
-			expect( viewRoot.name ).to.equal( 'div' );
-			expect( viewRoot.getAttribute( 'id' ) ).to.equal( 'editor' );
+
+			expect( viewRoot.name.toLowerCase() ).to.equal( 'div' );
 			expect( viewDocument.renderer.markedChildren.has( viewRoot ) ).to.be.true;
 		} );
 

+ 12 - 9
packages/ckeditor5-engine/tests/view/document/integration.js

@@ -9,29 +9,32 @@
 
 import Document from '/ckeditor5/engine/view/document.js';
 import ViewElement from '/ckeditor5/engine/view/element.js';
+import { isBlockFiller, BR_FILLER } from '/ckeditor5/engine/view/filler.js';
+
+import createElement from '/ckeditor5/utils/dom/createelement.js';
 
 describe( 'Document integration', () => {
 	it( 'should remove content of the DOM', () => {
-		const domP = document.createElement( 'p' );
-		const domDiv = document.createElement( 'div' );
-		domDiv.setAttribute( 'id', 'editor' );
-		domDiv.appendChild( domP );
+		const domDiv = createElement( document, 'div', { id: 'editor' }, [
+			createElement( document, 'p' ),
+			createElement( document, 'p' )
+		] );
 
 		const viewDocument = new Document();
-		viewDocument.createRoot( domDiv, 'editor' );
+		viewDocument.createRoot( domDiv );
 		viewDocument.render();
 
-		expect( domDiv.childNodes.length ).to.equal( 0 );
-		expect( domDiv.getAttribute( 'id' ) ).to.equal( 'editor' );
+		expect( domDiv.childNodes.length ).to.equal( 1 );
+		expect( isBlockFiller( domDiv.childNodes[ 0 ], BR_FILLER ) ).to.be.true;
 	} );
 
 	it( 'should render changes in the Document', () => {
 		const domDiv = document.createElement( 'div' );
 
 		const viewDocument = new Document();
-		viewDocument.createRoot( domDiv, 'editor' );
+		viewDocument.createRoot( domDiv );
 
-		viewDocument.viewRoots.get( 'editor' ).appendChildren( new ViewElement( 'p' ) );
+		viewDocument.getRoot().appendChildren( new ViewElement( 'p' ) );
 		viewDocument.render();
 
 		expect( domDiv.childNodes.length ).to.equal( 1 );