Skip to content

K
kityminder-core
Commit 389009a5 authored by campaign's avatar campaign
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

Conflicts:
	src/module/layout.default.js
parents 49bba4e6 6c149800
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 43 deletions
src/module/layout.bottom.js
View file @ 389009a5
...@@ -351,35 +351,9 @@ KityMinder.registerModule( "LayoutBottom", function () { ...@@ -351,35 +351,9 @@ KityMinder.registerModule( "LayoutBottom", function () {
default: default:
break; break;
} }
// this._fire( new MinderEvent( "beforeRenderNode", {
// node: node
// }, false ) );
// this._fire( new MinderEvent( "RenderNode", {
// node: node
// }, false ) );
this._firePharse( new MinderEvent( "RenderNodeLeft", {
node: node
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeCenter", {
node: node
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeRight", {
node: node
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeBottom", {
node: node
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeTop", {
node: node
}, false ) );
}, },
updateLayout: function ( node ) { updateLayout: function ( node ) {
// this._fire( new MinderEvent( "beforeRenderNode", { node.getRenderContainer().clear();
// node: node
// }, false ) );
// this._fire( new MinderEvent( "RenderNode", {
// node: node
// }, false ) );
this._firePharse( new MinderEvent( "RenderNodeLeft", { this._firePharse( new MinderEvent( "RenderNodeLeft", {
node: node node: node
}, false ) ); }, false ) );
...@@ -416,22 +390,7 @@ KityMinder.registerModule( "LayoutBottom", function () { ...@@ -416,22 +390,7 @@ KityMinder.registerModule( "LayoutBottom", function () {
_root.getLayout().align = "center"; _root.getLayout().align = "center";
updateBg( _root ); updateBg( _root );
initLayout( _root ); initLayout( _root );
this._firePharse( new MinderEvent( "RenderNodeLeft", { this.updateLayout( _root );
node: _root
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeCenter", {
node: _root
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeRight", {
node: _root
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeBottom", {
node: _root
}, false ) );
this._firePharse( new MinderEvent( "RenderNodeTop", {
node: _root
}, false ) );
updateShapeByCont( _root );
updateLayoutAll( _root ); updateLayoutAll( _root );
translateNode( _root ); translateNode( _root );
var _buffer = [ _root ]; var _buffer = [ _root ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment