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

Merge pull request #4882 from sb-relaxt-at/4881-drag-and-drop-bugfix

Browse Source 
jquery.jstree patched to improve drag-and-drop handling
This commit is contained in:
Damian Mooyman 2016-01-08 12:54:01 +13:00
commit 7e389b941b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/jstree/jquery.jstree.js vendored
View File

@ -1,5 +1,5 @@
/* /*
* jsTree 1.0-rc3 * jsTree (custom version for SilverStripe: 1.0-rc3 + minor bugfixes)
* http://jstree.com/ * http://jstree.com/
* *
* Copyright (c) 2010 Ivan Bozhanov (vakata.com) * Copyright (c) 2010 Ivan Bozhanov (vakata.com)
@ -2442,7 +2442,7 @@
0); 0);
} }
}, this)) }, this))
.delegate("a", "mouseup.jstree", $.proxy(function (e) { .delegate("a, #jstree-marker-line", "mouseup.jstree", $.proxy(function (e) {
if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) { if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
this.dnd_finish(e); this.dnd_finish(e);
} }
@ -2524,7 +2524,7 @@
$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid"); $.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
} }
}, this)) }, this))
.delegate(s.drop_target, "mouseup.jstree-" + this.get_index(), $.proxy(function (e) { .delegate(s.drop_target + ", #jstree-marker-line", "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {
if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) { if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e }); this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e });
} }