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

Commit 0d5880a

Browse files
committed
fixes
1 parent fde040f commit 0d5880a

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -269,31 +269,32 @@ export class FancytreeAdapter {
269269
dropedNode.renderTitle();
270270
var moveNodeInTree = (responseData) => {
271271
dropedNode.remove();
272-
if ('over' != data.hitMode) {
273-
dropedAtNode.addChildren(requestNodeToFancytreeNode(responseData));
274-
} else {
272+
if ('over' != data.hitMode && 'child' != data.hitMode) {
275273
dropedAtNode.parent.addChildren(requestNodeToFancytreeNode(responseData));
274+
} else {
275+
dropedAtNode.addChildren(requestNodeToFancytreeNode(responseData));
276276
}
277277
};
278+
var onError = (jqxhr, textStatus, errorThrown) => {
279+
console.error(errorThrown);
280+
281+
node._error = { message: 'Failed to move the node.', details: errorThrown };
282+
node.renderStatus();
283+
284+
setTimeout(function () {
285+
node._error = null;
286+
node.renderStatus();
287+
}, 1000);
288+
}
278289
this.requestData.move(dropNodePath, targetPath).done((responseData) => {
279-
if (this.dndOptions.reorder) {
290+
if (this.dndOptions.reorder && 'over' != data.hitMode && 'child' != data.hitMode) {
280291
this.requestData.reorder(parenPath, dropedAtPath, targetPath, data.hitMode).done((responseData) => {
281292
moveNodeInTree(responseData);
282-
});
293+
}).fail(onError);
283294
} else {
284295
moveNodeInTree(responseData);
285296
}
286-
}).fail((jqxhr, textStatus, errorThrown) => {
287-
console.error(errorThrown);
288-
289-
node._error = { message: 'Failed to move the node.', details: errorThrown };
290-
node.renderStatus();
291-
292-
setTimeout(function () {
293-
node._error = null;
294-
node.renderStatus();
295-
}, 1000);
296-
});
297+
}).fail(onError);
297298
}
298299
};
299300
}

0 commit comments

Comments
 (0)