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

question/type/ddwtos/amd/src/ddwtos.js

@@ -314,11 +314,11 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
         // Is there already a drag in this drop? if so, evict it.
         var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));
         if (oldDrag.length !== 0) {
-            oldDrag.addClass('beingdragged');
-            oldDrag.offset(oldDrag.offset());
             var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');
             var hiddenDrop = this.getDrop(oldDrag, currentPlace);
             hiddenDrop.addClass('active');
+            oldDrag.addClass('beingdragged');
+            oldDrag.offset(hiddenDrop.offset());
             this.sendDragHome(oldDrag);
         }
 

question/type/ddwtos/styles.css

@@ -34,7 +34,7 @@
     cursor: move;
 }
 
-.que.ddwtos .readonly .draghome {
+.que.ddwtos.qtype_ddwtos-readonly .draghome {
     cursor: default;
 }