8
0
فهرست منبع

TreeView main class tests and bugfixes.

Piotr Jasiun 10 سال پیش
والد
کامیت
c666495fab

+ 4 - 9
packages/ckeditor5-engine/src/treeview/renderer.js

@@ -10,11 +10,7 @@ import ViewText from './text.js';
 import ViewElement from './element.js';
 
 export default class Renderer {
-	constructor( treeView ) {
-		this.view = treeView.view;
-
-		this.domRoot = treeView.domRoot;
-
+	constructor() {
 		this.markedAttrs = new Set();
 		this.markedChildren = new Set();
 		this.markedTexts = new Set();
@@ -40,8 +36,6 @@ export default class Renderer {
 	}
 
 	render() {
-		const domDocument = this.domRoot.ownerDocument;
-
 		for ( let node of this.markedTexts ) {
 			if ( !this.markedChildren.has( node.parent ) && node.parent.getCorespondingDom() ) {
 				updateText( node );
@@ -90,6 +84,7 @@ export default class Renderer {
 			const domElement = viewElement.getCorespondingDom();
 			const domChildren = domElement.childNodes;
 			const viewChildren = Array.from( viewElement.getChildren() );
+			const domDocument = domElement.ownerDocument;
 
 			const actions = diff( domChildren, viewChildren, compareNodes );
 			let i = 0;
@@ -98,7 +93,7 @@ export default class Renderer {
 				if ( action === diff.EQUAL ) {
 					i++;
 				} else if ( action === diff.INSERT ) {
-					domElement.insertBefore( viewToDom( viewChildren[ i ] ), domChildren[ i ] || null  );
+					domElement.insertBefore( viewToDom( viewChildren[ i ], domDocument ), domChildren[ i ] || null  );
 					i++;
 				} else if ( action === diff.DELETE ) {
 					domElement.removeChild( domChildren[ i ] );
@@ -120,7 +115,7 @@ export default class Renderer {
 			return false;
 		}
 
-		function viewToDom( view ) {
+		function viewToDom( view, domDocument ) {
 			if ( view instanceof ViewText ) {
 				return domDocument.createTextNode( view.getText() );
 			} else {

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

@@ -24,7 +24,7 @@ export default class TreeView {
 		/**
 		 * Root of the view
 		 */
-		this.viewRoot = new RootElement( domElement.name, this );
+		this.viewRoot = new RootElement( domElement.tagName.toLowerCase(), this );
 		this.viewRoot.cloneDomAttrs( domElement );
 		this.viewRoot.bindDomElement( domElement );
 		this.viewRoot.markToSync( 'CHILDREN_NEED_UPDATE' );

+ 0 - 2
packages/ckeditor5-engine/tests/treeview/text.js

@@ -5,8 +5,6 @@
 
 /* bender-tags: treeview */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
 const modules = bender.amd.require(

+ 78 - 0
packages/ckeditor5-engine/tests/treeview/treeview.js

@@ -0,0 +1,78 @@
+/**
+ * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+/* bender-tags: treeview */
+
+'use strict';
+
+const modules = bender.amd.require(
+	'core/treeview/treeview',
+	'core/treeview/observer/observer',
+	'core/treeview/renderer'
+);
+
+describe( 'TreeView', () => {
+	let TreeView, Observer, Renderer;
+
+	before( () => {
+		TreeView = modules[ 'core/treeview/treeview' ];
+		Observer = modules[ 'core/treeview/observer/observer' ];
+		Renderer = modules[ 'core/treeview/renderer' ];
+	} );
+
+	describe( 'constructor', () => {
+		it( 'should create TreeView with all properties', () => {
+			const domP = document.createElement( 'p' );
+			const domDiv = document.createElement( 'div' );
+			domDiv.setAttribute( 'id', 'editor' );
+			domDiv.appendChild( domP );
+
+			const treeView = new TreeView( domDiv );
+
+			expect( treeView ).to.have.property( 'domRoot' ).that.equals( domDiv );
+			expect( treeView ).to.have.property( 'observers' ).that.is.instanceOf( Set );
+			expect( treeView ).to.have.property( 'renderer' ).that.is.instanceOf( Renderer );
+			expect( treeView ).to.have.property( 'viewRoot' );
+
+			expect( treeView.viewRoot.getCorespondingDom() ).to.equal( domDiv );
+			expect( treeView.viewRoot.name ).to.equal( 'div' );
+			expect( treeView.viewRoot.getAttr( 'id' ) ).to.equal( 'editor' );
+			expect( treeView.renderer.markedChildren.has( treeView.viewRoot ) ).to.be.true;
+		} );
+	} );
+
+	describe( 'observer', () => {
+		let observerMock, treeView;
+
+		beforeEach( () => {
+			observerMock = new Observer();
+			observerMock.attach = sinon.spy();
+			observerMock.detach = sinon.spy();
+			observerMock.init = sinon.spy();
+
+			treeView = new TreeView( document.createElement( 'div' ) );
+			treeView.renderer.render = sinon.spy();
+		} );
+
+		it( 'should be inited and attached on adding', () => {
+			treeView.addObserver( observerMock );
+
+			expect( treeView.observers.has( observerMock ) ).to.be.true;
+			sinon.assert.calledOnce( observerMock.init );
+			sinon.assert.calledWith( observerMock.init, treeView );
+			sinon.assert.calledOnce( observerMock.attach );
+		} );
+
+		it( 'should be detached and reattached on render', () => {
+			treeView.addObserver( observerMock );
+			treeView.render();
+
+			expect( treeView.observers.has( observerMock ) ).to.be.true;
+			sinon.assert.calledOnce( observerMock.detach );
+			sinon.assert.calledOnce( treeView.renderer.render );
+			sinon.assert.calledTwice( observerMock.attach );
+		} );
+	} );
+} );