From ef6f42a825371d43062b808e460ddbc682399357 Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Sun, 25 Oct 2020 20:13:39 +0700
Subject: [PATCH 1/1] MDL-69930 qtype_ddimageortext: Duplication items in
 drag-onto-image question

---
 .../ddimageortext/amd/build/question.min.js   | Bin 14869 -> 15079 bytes
 .../amd/build/question.min.js.map             | Bin 72392 -> 73400 bytes
 .../type/ddimageortext/amd/src/question.js    |  17 +++++++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/question/type/ddimageortext/amd/build/question.min.js b/question/type/ddimageortext/amd/build/question.min.js
index d315b9dc8d79db222035d45af05a6c8a5fc776f1..e5c040f9161b876fd1446f82930a2912aec05a5f 100644
GIT binary patch
delta 243
zcmbPQ^1O6Io(Nx>PP%4wSz?hwhHauo`s8`SlJXgvYHEt9dYQ#8MTzObiMgqcKvsT%
zMv6{`re<}<<UPXbj2V;Xi>hpXCeq9(R#Ssb?c@ofCYxu8O_q>I(JLs*FUc>dEI?H^
z*-uN!$vGoGGdWcwQPbAewj?97ST8-b1S*yUbOubwy(qu5096%4C`og(w!S!vd}&@%
lW?qVhQf_`}acW9_d7eT^era+>aY<rPiIS%EW(VV|YyioLRf_-s

delta 35
tcmV+;0NnrQb(M6mZWNP{6MM4*6@USgtran|%@&gwv)(Ti1hW)0(*_Z34haAN

diff --git a/question/type/ddimageortext/amd/build/question.min.js.map b/question/type/ddimageortext/amd/build/question.min.js.map
index 28b05d35eed14b8a76a86408123c70b2941686ba..75f4f821fbdede89c81d90ea80133516e9a8cd1a 100644
GIT binary patch
delta 4685
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
DLIY<X

delta 3969
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

diff --git a/question/type/ddimageortext/amd/src/question.js b/question/type/ddimageortext/amd/src/question.js
index 8d031bf12c6..f3318d3c2ef 100644
--- a/question/type/ddimageortext/amd/src/question.js
+++ b/question/type/ddimageortext/amd/src/question.js
@@ -375,7 +375,7 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
         });
         this.getRoot().find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {
             var drop = $(dropNode);
-            if (thisQ.isPointInDrop(pageX, pageY, drop)) {
+            if (thisQ.isPointInDrop(pageX, pageY, drop) && !thisQ.isDragSameAsDrop(drag, drop)) {
                 drop.addClass('valid-drag-over-drop');
             } else {
                 drop.removeClass('valid-drag-over-drop');
@@ -410,7 +410,7 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
 
         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;
             }
@@ -917,6 +917,17 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
         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.
@@ -996,6 +1007,8 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
          * @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);
         },
 
-- 
2.17.1