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

Conflicts:
	lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js

lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js

@@ -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);
     },
 

lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js

@@ -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);
     },
 

lib/yui/src/dragdrop/js/dragdrop.js

@@ -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);
     },