tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG Restore tree children after updateNode() (fixes #7761)

Browse Source
This commit is contained in:
Ingo Schommer 2012-08-22 15:33:28 +02:00
parent e9c8674739
commit ae9c2e78a1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/javascript/LeftAndMain.Tree.js
View File

@ -285,7 +285,8 @@
} }
// Replace inner content // Replace inner content
node.addClass(origClasses).html(newNode.html()); var origChildren = node.children('ul').detach();
node.addClass(origClasses).html(newNode.html()).append(origChildren);
if (nextNode && nextNode.length) { if (nextNode && nextNode.length) {
this.jstree('move_node', node, nextNode, 'before'); this.jstree('move_node', node, nextNode, 'before');
@ -354,23 +355,25 @@
return; return;
} }
var correctStateFn = function(node) {
self.jstree('deselect_all');
self.jstree('select_node', node);
// Similar to jstree's correct_state, but doesn't remove children
var hasChildren = (node.children('ul').length > 0);
node.toggleClass('jstree-leaf', !hasChildren);
if(!hasChildren) node.removeClass('jstree-closed jstree-open');
};
// Check if node exists, create if necessary // Check if node exists, create if necessary
if(node.length) { if(node.length) {
self.updateNode(node, nodeData.html, nodeData); self.updateNode(node, nodeData.html, nodeData);
setTimeout(function() { setTimeout(function() {
self.jstree('deselect_all'); correctStateFn(node) ;
self.jstree('select_node', node);
// Manually correct state, which checks for children and
// removes toggle arrow (should really be done by jstree internally)
self.jstree('correct_state', node);
}, 500); }, 500);
} else { } else {
includesNewNode = true; includesNewNode = true;
self.createNode(nodeData.html, nodeData, function(newNode) { self.createNode(nodeData.html, nodeData, function(newNode) {
self.jstree('deselect_all'); correctStateFn(newNode);
self.jstree('select_node', newNode);
// Manually remove toggle node, see above
self.jstree('correct_state', newNode);
}); });
} }
}); });