Merge branch 'MDL-70248-310' of https://github.com/HuongNV13/moodle into MOODLE_310_STABLE

question/type/ddimageortext/amd/src/form.js

@@ -211,7 +211,7 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
 
             // Resize them to the same size.
             $('.dropzones .droppreview').css('padding', '0');
-            var numGroups = $('select.draggroup').first().find('option').length;
+            var numGroups = $('.draggroup select').first().find('option').length;
             for (var group = 1; group <= numGroups; group++) {
                 dragDropToImageForm.resizeAllDragsAndDropsInGroup(group);
             }
@@ -398,9 +398,8 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
                 top = Math.round(dropPosition.top - backgroundPosition.top);
 
             // Constrain coordinates to be inside the background.
-            // The -10 here matches the +10 in resizeAllDragsAndDropsInGroup().
-            left = Math.max(0, Math.min(left, backgroundImage.width() - drop.width() - 10));
-            top = Math.max(0, Math.min(top, backgroundImage.height() - drop.height() - 10));
+            left = Math.round(Math.max(0, Math.min(left, backgroundImage.outerWidth() - drop.outerWidth())));
+            top = Math.round(Math.max(0, Math.min(top, backgroundImage.outerHeight() - drop.outerHeight())));
 
             // Update the form.
             dragDropToImageForm.form.setFormValue('drops', [dropNo, 'xleft'], left);

question/type/ddimageortext/styles.css

@@ -99,6 +99,7 @@ form.mform fieldset#id_previewareaheader .dragitems {
 form.mform fieldset#id_previewareaheader .droppreview {
     position: absolute;
     cursor: move;
+    white-space: nowrap;
 }
 
 .que.ddimageortext .dragitems.readonly .drag {