5bbf49f70aefeb86408e66aefd4fc3da439263dd braney Tue Jan 30 14:19:34 2018 -0800 fix bug with collections being deleted when their folder was clicked diff --git src/hg/js/hgCollection.js src/hg/js/hgCollection.js index 504cc81..cc6c659 100644 --- src/hg/js/hgCollection.js +++ src/hg/js/hgCollection.js @@ -289,32 +289,31 @@ var id = treeObject.attr('id'); var node = treeObject.jstree("get_node", id); if (node.children.length === 0) { var parentId = $(selectedNode).attr('id'); checkEmpty(parentId); isDirty = true; $(selectedTree).jstree("copy_node", node, parentId,'last'); } } function minusHit (event, data) { // called with the minus icon is hit var treeObject = $(event.currentTarget).parent().parent(); var id = treeObject.attr('id'); var node = treeObject.jstree("get_node", id); - //if (node.children.length === 0) { - if (node.li_attr.class !== "folder") { + if (node.children.length === 0) { isDirty = true; var parentNode = treeObject.jstree("get_node", node.parent); if (parentNode.children.length === 1) { treeObject.jstree("create_node", node.parent, emptyCollectionText); parentNode.li_attr.class = "folder empty"; } $(selectedTree).jstree( "delete_node", node); } } function init() { // called at initialization time $body = $("body"); emptyCollectionText = $('#emptyCollectionText').text();