Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit bb04b7a

Browse files
author
Charles Marion
committed
ENH: New Jquery version
1 parent bfb4b68 commit bb04b7a

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

core/public/js/layout/jquery.js

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/public/js/layout/jquery.treeTable.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,9 @@
5252

5353
// Recursively hide all node's children in a tree
5454
$.fn.collapse = function() {
55-
$(this).addClass("collapsed");
56-
childrenOf($(this)).each(function() {
57-
if(!$(this).hasClass("collapsed")) {
58-
$(this).collapse();
59-
}
60-
61-
this.style.display = "none"; // Performance! $(this).hide() is slow...
62-
});
55+
var id = $(this).attr('id');
56+
$('tr[id*="'+id+'"]').addClass("collapsed").hide();
57+
$(this).show();
6358
colorLines(true);
6459
return this;
6560
};
@@ -156,16 +151,13 @@
156151
{
157152
// $(this).find('td:first').prepend('<img class="tableLoading" alt="" src="'+json.global.coreWebroot+'/public/images/icons/loading.gif"/>');
158153
}
154+
155+
var id = $(this).attr('id');
156+
159157
$(this).removeClass("collapsed").addClass("expanded");
160-
childrenOf($(this)).each(function() {
158+
$('tr[id*="'+id+'"]').show();
159+
$('tr[id*="'+id+'"]').each(function() {
161160
initialize($(this));
162-
163-
if($(this).is(".expanded.parent")) {
164-
$(this).expand();
165-
}
166-
167-
// this.style.display = "table-row"; // Unfortunately this is not possible with IE :-(
168-
$(this).show();
169161
});
170162
initializeAjax($(this),false);
171163
colorLines(true);

0 commit comments

Comments
 (0)