From 84baa5285dbd27a3e7a6eb48bb3ec59fc2325b11 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 6 Jan 2017 17:08:49 +0530 Subject: [PATCH] [minor] tree, expand on select, dont collapse --- frappe/public/js/frappe/ui/tree.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js index 24d03bdfcc..96fb67addb 100644 --- a/frappe/public/js/frappe/ui/tree.js +++ b/frappe/public/js/frappe/ui/tree.js @@ -33,7 +33,7 @@ frappe.ui.Tree = Class.extend({ toggle: function() { this.get_selected_node().toggle(); } -}) +}); frappe.ui.TreeNode = Class.extend({ init: function(args) { @@ -61,9 +61,6 @@ frappe.ui.TreeNode = Class.extend({ if(me.tree.toolbar) { me.show_toolbar(); } - if(me.toggle_on_click) { - me.toggle(); - } if(me.tree.click) me.tree.click(this); }) @@ -87,9 +84,13 @@ frappe.ui.TreeNode = Class.extend({ $(icon_html + ' ' + this.get_label() + ""). appendTo(this.tree_link); - this.tree_link.find('i, a').click(function() { + this.tree_link.find('i').click(function() { setTimeout(function() { me.toolbar.find(".btn-expand").click(); }, 100); }); + + this.tree_link.find('a').click(function() { + if(!me.expanded) setTimeout(function() { me.toolbar.find(".btn-expand").click(); }, 100); + }); }, get_label: function() { if(this.tree.get_label) {