Merge branch 'MDL-69930-master' of https://github.com/HuongNV13/moodle

# Conflicts:
#	question/type/ddimageortext/amd/build/question.min.js
#	question/type/ddimageortext/amd/build/question.min.js.map
#	question/type/ddimageortext/amd/src/question.js

diff --combined question/type/ddimageortext/amd/build/question.min.js
index ddab8b6,e5c040f..7bebe76
Binary files differ

diff --combined question/type/ddimageortext/amd/build/question.min.js.map
index e731d71,75f4f82..801f740
Binary files differ

diff --combined question/type/ddimageortext/amd/src/question.js
index bdd8d17,f3318d3..c62e611
--- 1/question/type/ddimageortext/amd/src/question.js
--- 2/question/type/ddimageortext/amd/src/question.js
+++ b/question/type/ddimageortext/amd/src/question.js
@@@ -364,12 -364,10 +364,12 @@@ define(['jquery', 'core/dragdrop', 'cor
       * @param {jQuery} drag the item being moved.
       */
      DragDropOntoImageQuestion.prototype.dragMove = function(pageX, pageY, drag) {
 -        var thisQ = this;
 +        var thisQ = this,
 +            highlighted = false;
          this.getRoot().find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {
              var drop = $(dropNode);
 -            if (thisQ.isPointInDrop(pageX, pageY, drop)) {
 +            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted) {
 +                highlighted = true;
                  drop.addClass('valid-drag-over-drop');
              } else {
                  drop.removeClass('valid-drag-over-drop');
@@@ -377,8 -375,7 +377,8 @@@
          });
          this.getRoot().find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {
              var drop = $(dropNode);
-             if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted) {
 -            if (thisQ.isPointInDrop(pageX, pageY, drop) && !thisQ.isDragSameAsDrop(drag, drop)) {
++            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted && !thisQ.isDragSameAsDrop(drag, drop)) {
 +                highlighted = true;
                  drop.addClass('valid-drag-over-drop');
              } else {
                  drop.removeClass('valid-drag-over-drop');
@@@ -397,8 -394,6 +397,8 @@@
          var thisQ = this,
              root = this.getRoot(),
              placed = false;
 +
 +        // Looking for drag that was dropped on a dropzone.
          root.find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {
              var drop = $(dropNode);
              if (!thisQ.isPointInDrop(pageX, pageY, drop)) {
@@@ -413,24 -408,21 +413,24 @@@
              return false; // Stop the each() here.
          });
  
 -        root.find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, placedNode) {
 -            var placedDrag = $(placedNode);
 -            if (!thisQ.isPointInDrop(pageX, pageY, placedDrag) || thisQ.isDragSameAsDrop(drag, placedDrag)) {
 -                // Not this placed drag.
 -                return true;
 -            }
 +        if (!placed) {
 +            // Looking for drag that was dropped on a placed drag.
 +            root.find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, placedNode) {
 +                var placedDrag = $(placedNode);
-                 if (!thisQ.isPointInDrop(pageX, pageY, placedDrag)) {
++                if (!thisQ.isPointInDrop(pageX, pageY, placedDrag) || thisQ.isDragSameAsDrop(drag, placedDrag)) {
 +                    // Not this placed drag.
 +                    return true;
 +                }
  
 -            // Now put this drag into the drop.
 -            placedDrag.removeClass('valid-drag-over-drop');
 -            var currentPlace = thisQ.getClassnameNumericSuffix(placedDrag, 'inplace');
 -            var drop = thisQ.getDrop(drag, currentPlace);
 -            thisQ.sendDragToDrop(drag, drop);
 -            placed = true;
 -            return false; // Stop the each() here.
 -        });
 +                // Now put this drag into the drop.
 +                placedDrag.removeClass('valid-drag-over-drop');
 +                var currentPlace = thisQ.getClassnameNumericSuffix(placedDrag, 'inplace');
 +                var drop = thisQ.getDrop(drag, currentPlace);
 +                thisQ.sendDragToDrop(drag, drop);
 +                placed = true;
 +                return false; // Stop the each() here.
 +            });
 +        }
  
          if (!placed) {
              this.sendDragHome(drag);
@@@ -925,6 -917,17 +925,17 @@@
          return zIndex;
      };
  
+     /**
+      * Check that the drag is drop to it's clone.
+      *
+      * @param {jQuery} drag The drag.
+      * @param {jQuery} drop The drop.
+      * @returns {boolean}
+      */
+     DragDropOntoImageQuestion.prototype.isDragSameAsDrop = function(drag, drop) {
+         return this.getChoice(drag) === this.getChoice(drop) && this.getGroup(drag) === this.getGroup(drop);
+     };
+ 
      /**
       * Singleton object that handles all the DragDropOntoImageQuestions
       * on the page, and deals with event dispatching.
@@@ -1004,6 -1007,8 +1015,8 @@@
           * @param {jQuery} element Element to bind the event
           */
          addEventHandlersToDrag: function(element) {
+             // Unbind all the mousedown and touchstart events to prevent double binding.
+             element.unbind('mousedown touchstart');
              element.on('mousedown touchstart', questionManager.handleDragStart);
          },