eb63a9eebad06a2a327314f5ce36158b914e5648 braney Thu Feb 8 10:21:01 2018 -0800 change legal characters in labels to include some punctuation diff --git src/hg/js/hgCollection.js src/hg/js/hgCollection.js index edc7022..02d877a 100644 --- src/hg/js/hgCollection.js +++ src/hg/js/hgCollection.js @@ -58,34 +58,41 @@ $(selectedTree).jstree( "delete_node", nodes); if (parentNode.id === '#') { var firstChild = $(selectedTree).find("li").first(); $(selectedTree).jstree("select_node", $(firstChild).attr("id")); } else { $(selectedTree).jstree( "select_node", parentNode.id); } } } }; return items; } function changeCollection() { + var newName = $("#customName").val().trim(); + if (!validateLabel(newName)) + return; + + var newDescription = $("#customDescription").val().trim(); + if (!validateLabel(newDescription)) + return; $( "#newCollectionDialog" ).dialog("close"); selectedNode.li_attr.class = "folder"; - selectedNode.li_attr.shortlabel = $("#customName").val().trim(); - selectedNode.li_attr.longlabel = $("#customDescription").val().trim(); + selectedNode.li_attr.shortlabel = newName; + selectedNode.li_attr.longlabel = newDescription; selectedNode.li_attr.visibility = $("#customVis").val(); selectedNode.li_attr.color = $("#customColorInput").val(); selectedNode.li_attr.missingmethod = $("input:radio[name ='missingData']:checked").val(); selectedNode.li_attr.viewfunc = $("#viewFunc").val(); rebuildLabel(); } function doubleClickNode(tree) { var node = $(selectedTree).jstree("get_node", tree.id); var color = node.li_attr.color; var name = node.li_attr.shortlabel; var description = node.li_attr.longlabel; var visibility = node.li_attr.visibility; var type = node.li_attr.viewtype; var viewFunc = node.li_attr.viewfunc;