Skip to content
This repository has been archived by the owner on Feb 5, 2025. It is now read-only.

fixed bug when child is collapsed #89

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed bug when child is collapsed #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e9b9c
fixed bug when child is collapsed, then the grandchilds keeps visible…
alanblins Nov 12, 2018
9532010
Merge branch 'master' into bug_grandchild_visible
alanblins Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions dist/bootstrap-treeview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,10 @@
}

// set visible state; based parent state plus levels
if ((parent && parent.state && parent.state.expanded) ||
(level <= this._options.levels)) {
var isParentExpanded = (parent && parent.state && parent.state.expanded);
var isParentStateExpandedUndefined = (!parent || !parent.state || !parent.state.hasOwnProperty("expanded") );
if ((isParentExpanded) ||
(level <= this._options.levels && isParentStateExpandedUndefined) ) {
node.state.visible = true;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion dist/bootstrap-treeview.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions public/js/bootstrap-treeview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,10 @@
}

// set visible state; based parent state plus levels
if ((parent && parent.state && parent.state.expanded) ||
(level <= this._options.levels)) {
var isParentExpanded = (parent && parent.state && parent.state.expanded);
var isParentStateExpandedUndefined = (!parent || !parent.state || !parent.state.hasOwnProperty("expanded") );
if ((isParentExpanded) ||
(level <= this._options.levels && isParentStateExpandedUndefined) ) {
node.state.visible = true;
}
else {
Expand Down
6 changes: 4 additions & 2 deletions src/js/bootstrap-treeview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,10 @@
}

// set visible state; based parent state plus levels
if ((parent && parent.state && parent.state.expanded) ||
(level <= this._options.levels)) {
var isParentExpanded = (parent && parent.state && parent.state.expanded);
var isParentStateExpandedUndefined = (!parent || !parent.state || !parent.state.hasOwnProperty("expanded") );
if ((isParentExpanded) ||
(level <= this._options.levels && isParentStateExpandedUndefined) ) {
node.state.visible = true;
}
else {
Expand Down
6 changes: 4 additions & 2 deletions tests/lib/bootstrap-treeview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,10 @@
}

// set visible state; based parent state plus levels
if ((parent && parent.state && parent.state.expanded) ||
(level <= this._options.levels)) {
var isParentExpanded = (parent && parent.state && parent.state.expanded);
var isParentStateExpandedUndefined = (!parent || !parent.state || !parent.state.hasOwnProperty("expanded") );
if ((isParentExpanded) ||
(level <= this._options.levels && isParentStateExpandedUndefined) ) {
node.state.visible = true;
}
else {
Expand Down
28 changes: 28 additions & 0 deletions tests/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,4 +1194,32 @@
.treeview(true);
});

test('Correct initial levels shown with state', function () {
var dataWithStates = [
{
text: 'Parent 1',
nodes: [
{
text: 'Child 1',
state:{expanded:false},
nodes: [
{
text: 'Grandchild 1'
},
{
text: 'Grandchild 2'
}
]
}
]
}
];

var $tree = init({
data: dataWithStates,
levels:5
});

equal($($tree.selector + ' ul li:not(.node-hidden)').length, 2, 'Correctly display 1 root and 1 child node when levels set to 5 and child is collapsed.');
});
}());