From 79d7da0ba1fdb5aa9567a56aee94d9f7f4c274f4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 9 Aug 2011 12:29:51 +0200 Subject: [PATCH] [REM] bunch of useless shit in the code for hiding/displaying already-loaded records bzr revid: xmo@openerp.com-20110809102951-vgy8sh2mws48fu3y --- addons/base/static/src/js/tree.js | 48 +++++++------------------------ 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js index ef4d03b34f1..46f795f1b55 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/tree.js @@ -116,10 +116,8 @@ openerp.base.TreeView = openerp.base.View.extend({ if ($this.attr('src') == '/base/static/src/img/expand.gif') { self.getdata(record_id, children_ids, true); } - } else if (is_loaded > 0) { - self.showcontent(record_id, true, children_ids); } else { - self.showcontent(record_id, false, children_ids); + self.showcontent(record_id, is_loaded < 0); } }); }, @@ -254,43 +252,19 @@ openerp.base.TreeView = openerp.base.View.extend({ }, // show & hide the contents - showcontent: function (id, flag, childid) { - var self = this; + showcontent: function (record_id, show) { + this.$element.find('#parentimg_' + record_id) + .attr('src', show ? '/base/static/src/img/collapse.gif' : '/base/static/src/img/expand.gif'); - var first_child = $('tr #treerow_' + id).find('td').children(':first-child'); - if (flag) { - first_child.attr('src', '/base/static/src/img/expand.gif'); - } - else { - first_child.attr('src', '/base/static/src/img/collapse.gif'); - } + var descendants = this.records[record_id][this.children_field]; + for (var i = 0; i < descendants.length; i++) { + var child_id = descendants[i]; - for (var i = 0; i < childid.length; i++) { - if (flag) { - self.dataset.domain = [['parent_id', '=', parseInt(childid[i], 10)]]; - var childimg = $('tr #treerow_' + childid[i]).find('td').children(':first-child').attr('src'); - - if (childimg == "/base/static/src/img/collapse.gif") { - $('tr #treerow_' + childid[i]).find('td').children(':first-child').attr('src','/base/static/src/img/expand.gif'); - } - - self.dataset.read_slice([], 0, false, function (response) { - for (var j = 0; j < response.length; j++) { - var res_ids = $('tr #treerow_' + response[j].id); - if (res_ids.length > 0) { - res_ids.hide(); - var subchildids = response[j].child_id; - if (subchildids.length > 0) { - self.showcontent(response[j].id, true, subchildids); - } - } - } - }); - $ ('tr #treerow_' + childid[i]).hide(); - } - else { - $ ('tr #treerow_' + childid[i]).show(); + if (this.$element.find('img#parentimg_' + child_id).length) { + this.showcontent(child_id, false); } + + this.$element.find('#treerow_' + child_id).toggle(show); } },