Skip to content

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

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

parents 1f40d528 aeea4585
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
src/module/layout.default.js
View file @ 06532951
...@@ -569,7 +569,7 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -569,7 +569,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
var c = _buffer[ j ].getChildren(); var c = _buffer[ j ].getChildren();
if ( if (
( (
( ( sub_nolimit || ( c.length <= expandoptions.defaultSubShow ) ) && ( cur_layer <= expand_layer ) ) || ( ( sub_nolimit || ( c.length <= expandoptions.defaultSubShow ) ) && ( layer_nolimit || ( cur_layer <= expand_layer ) ) ) ||
_buffer[ j ].getLayout().expand _buffer[ j ].getLayout().expand
) && c.length !== 0 ) { ) && c.length !== 0 ) {
this.expandNode( _buffer[ j ] ); this.expandNode( _buffer[ j ] );
...@@ -594,7 +594,6 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -594,7 +594,6 @@ KityMinder.registerModule( "LayoutDefault", function () {
node.getContRc().clear(); node.getContRc().clear();
Layout = node.getLayout(); Layout = node.getLayout();
Layout.expand = oldExpand || false; Layout.expand = oldExpand || false;
console.log( oldExpand );
if ( parent.getType() !== 'root' ) { if ( parent.getType() !== 'root' ) {
parent.getLayout().expand = true; parent.getLayout().expand = true;
} }
......
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