Skip to content

Commit 0b49f40

Browse files
Dropping descendants behaviour improvement, visual improvements
1 parent 1d60eac commit 0b49f40

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "iknow-entity-browser",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"description": "Visualizer for iKnow entities",
55
"main": "gulpfile.babel.js",
66
"scripts": {

src/static/js/controls.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ onSelectionUpdate((sel) => {
1414
});
1515

1616
function updateButtons () {
17-
let display = selection.length ? "block" : "none";
18-
dropChildrenButton.style.display = display;
17+
let toDrop = 0;
18+
for (let node of selection) {
19+
toDrop += (node.children ? node.children.length : 0);
20+
}
1921
removeButton.classList.add("disabled"); // temporary
22+
dropChildrenButton.classList[toDrop > 0 ? "remove" : "add"]("disabled");
2023
}
2124

2225
function deleteSelection () {

src/static/js/model/index.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,24 +277,21 @@ export function dropDescendants (nodes) {
277277

278278
let toDrop = 0;
279279
for (let node of nodes) {
280-
toDrop += (node.children ? node.children.length : 0)
281-
+ (node._children ? node._children.length : 0);
280+
toDrop += (node.children ? node.children.length : 0);
282281
}
283282
if (toDrop === 0)
284283
return 0;
285284

286285
let restore = nodes.slice().map(node => {
287286
return {
288287
node: node,
289-
children: node.children,
290-
_children: node._children
288+
children: node.children
291289
};
292290
});
293291

294292
function f () {
295293
for (let node of nodes) {
296294
node.children = [];
297-
node._children = [];
298295
}
299296
dataUpdated();
300297
}
@@ -305,7 +302,6 @@ export function dropDescendants (nodes) {
305302
undo: () => {
306303
for (let res of restore) {
307304
res.node.children = res.children;
308-
res.node._children = res._children;
309305
}
310306
dataUpdated();
311307
}

0 commit comments

Comments
 (0)