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

Commit 1863d60

Browse files
committed
clean code and sort children after move
1 parent 0d5880a commit 1863d60

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

src/Resources/assets/js/adapter/fancytree.js

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -251,31 +251,23 @@ export class FancytreeAdapter {
251251
return true;
252252
},
253253
dragDrop: (node, data) => {
254-
var dropedNode = data.otherNode;
255-
var dropedAtNode = data.node;
256-
257-
var dropNodePath = dropedNode.data.refPath;
258-
var dropedAtPath = dropedAtNode.data.refPath;
259-
var parenPath = '';
260-
if ('over' != data.hitMode && 'child' != data.hitMode) {
261-
// a node at a specific place can still be a drop in a new parent
262-
parenPath = dropedAtNode.parent.data.refPath;
263-
} else {
264-
parenPath = dropedAtPath;
265-
}
266-
var targetPath = parenPath + '/' + dropNodePath.substr(1 + dropNodePath.lastIndexOf('/'));
254+
let dropedNode = data.otherNode;
255+
let dropedAtNode = data.node;
256+
257+
let dropNodePath = dropedNode.data.refPath;
258+
let dropedAtPath = dropedAtNode.data.refPath;
259+
let parentNode = ('over' != data.hitMode && 'child' != data.hitMode) ? dropedAtNode.parent : dropedAtNode;
260+
let parenPath = parenNode.data.refPath;
261+
let targetPath = parenPath + '/' + dropNodePath.substr(1 + dropNodePath.lastIndexOf('/'));
267262

268263
dropedNode.icon = 'fa fa-spinner fa-spin';
269264
dropedNode.renderTitle();
270-
var moveNodeInTree = (responseData) => {
265+
let moveNodeInTree = (responseData) => {
271266
dropedNode.remove();
272-
if ('over' != data.hitMode && 'child' != data.hitMode) {
273-
dropedAtNode.parent.addChildren(requestNodeToFancytreeNode(responseData));
274-
} else {
275-
dropedAtNode.addChildren(requestNodeToFancytreeNode(responseData));
276-
}
267+
parentNode.addChildren(requestNodeToFancytreeNode(responseData));
268+
parentNode.sortChildren(null, true);
277269
};
278-
var onError = (jqxhr, textStatus, errorThrown) => {
270+
let onError = (jqxhr, textStatus, errorThrown) => {
279271
console.error(errorThrown);
280272

281273
node._error = { message: 'Failed to move the node.', details: errorThrown };

0 commit comments

Comments
 (0)