Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DND: 3 new features #2689

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DND: 3 new features #2689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb98626
DND: optional dragging all nodes instead of top-level ones, preservin…
rajniszp Jan 16, 2023
57d60b2
Merge pull request #1 from vakata/master
rajniszp Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions src/jstree.dnd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,25 @@
* @name $.jstree.defaults.dnd.blank_space_drop
* @plugin dnd
*/
blank_space_drop: false
blank_space_drop: false,
/**
* controls whether all nodes are dragged or only top level selected nodes (ignoring children of selected nodes). Defaults to `false`.
* @name $.jstree.defaults.dnd.drag_all_nodes
* @plugin dnd
*/
drag_all_nodes: false,
/**
* controls whether nodes that are dragged should be kept in the original order from origin tree (when true) or in order of selecting (when false). Defaults to `false`.
* @name $.jstree.defaults.dnd.preserve_nodes_order
* @plugin dnd
*/
preserve_nodes_order: false,
/**
* a boolean indicating if dnd should be enabled or not. Useful if you want to dynamically disable editing of the tree. Defaults to `false`.
* @name $.jstree.defaults.dnd.disabled
* @plugin dnd
*/
disabled: false
};
var drg, elm;
// TODO: now check works by checking for each node individually, how about max_children, unique, etc?
Expand All @@ -112,22 +130,30 @@

this.element
.on(this.settings.dnd.use_html5 ? 'dragstart.jstree' : 'mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', function (e) {
if (this.settings.dnd.disabled) {
return false;
}

if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
return true;
}
if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
return true;
}
var obj = this.get_node(e.target),
mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? (this.settings.dnd.drag_all_nodes ? this.get_selected() : this.get_top_selected()).length : 1,
txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
if(this.settings.core.force_text) {
txt = $.vakata.html.escape(txt);
}
if(obj && (obj.id || obj.id === 0) && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart" || e.type === "dragstart") &&
(this.settings.dnd.is_draggable === true || ($.vakata.is_function(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
) {
drg = { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] };
drg = { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? (this.settings.dnd.drag_all_nodes ? this.get_selected() : this.get_top_selected()) : [obj.id] };
if (this.settings.dnd.preserve_nodes_order) {
var ord = this.get_node($.jstree.root).children_d;
drg.nodes.sort(function (a, b) { return ord.indexOf(b) - ord.indexOf(a); });
}
elm = e.currentTarget;
if (this.settings.dnd.use_html5) {
$.vakata.dnd._trigger('start', e, { 'helper': $(), 'element': elm, 'data': drg });
Expand Down Expand Up @@ -226,7 +252,7 @@
rel = false,
tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm, is_copy, pn, c;
// if we are over an instance
if(ins && ins._data && ins._data.dnd) {
if(ins && ins._data && ins._data.dnd && !ins.settings.dnd.disabled) {
marker.attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ));
is_copy = data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)));
data.helper
Expand Down