mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle

Browse Source 
Conflicts:
	lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
This commit is contained in:
Sam Hemelryk 2014-02-17 09:06:58 +13:00
commit fa52e6494d
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js vendored
View File

@ -538,6 +538,15 @@ Y.extend(DRAGDROP, Y.Base, {
// Simulate the full sequence.
this.drag_start(dragevent);
this.global_drop_over(dropevent);
if (droptarget.hasClass(this.parentnodeclass) && droptarget.contains(dragcontainer)) {
// The global_drop_over function does not handle the case where an item was moved up, without the
// 'goingup' variable being set, as is the case wih keyboard drag/drop. We must detect this case and
// apply it after the drop_over, but before the drop_hit event in order for it to be moved to the
// correct location.
droptarget.prepend(dragcontainer);
}
this.global_drop_hit(dropevent);
},

4
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js vendored
View File

File diff suppressed because one or more lines are too long

9
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js vendored
View File

@ -538,6 +538,15 @@ Y.extend(DRAGDROP, Y.Base, {
// Simulate the full sequence.
this.drag_start(dragevent);
this.global_drop_over(dropevent);
if (droptarget.hasClass(this.parentnodeclass) && droptarget.contains(dragcontainer)) {
// The global_drop_over function does not handle the case where an item was moved up, without the
// 'goingup' variable being set, as is the case wih keyboard drag/drop. We must detect this case and
// apply it after the drop_over, but before the drop_hit event in order for it to be moved to the
// correct location.
droptarget.prepend(dragcontainer);
}
this.global_drop_hit(dropevent);
},

9
lib/yui/src/dragdrop/js/dragdrop.js vendored
View File

@ -536,6 +536,15 @@ Y.extend(DRAGDROP, Y.Base, {
// Simulate the full sequence.
this.drag_start(dragevent);
this.global_drop_over(dropevent);
if (droptarget.hasClass(this.parentnodeclass) && droptarget.contains(dragcontainer)) {
// The global_drop_over function does not handle the case where an item was moved up, without the
// 'goingup' variable being set, as is the case wih keyboard drag/drop. We must detect this case and
// apply it after the drop_over, but before the drop_hit event in order for it to be moved to the
// correct location.
droptarget.prepend(dragcontainer);
}
this.global_drop_hit(dropevent);
},