Merge pull request #4398 from dpalou/MOBILE-4648

MOBILE-4648 qtype: Retrieve drop zone info from data-set attribute

Author: crazyserver

src/addons/qtype/ddimageortext/component/ddimageortext.ts

@@ -18,6 +18,7 @@ import { AddonModQuizQuestionBasicData, CoreQuestionBaseComponent } from '@featu
 import { CoreQuestionHelper } from '@features/question/services/question-helper';
 import { AddonQtypeDdImageOrTextQuestion } from '../classes/ddimageortext';
 import { CoreSharedModule } from '@/core/shared.module';
+import { CoreText } from '@singletons/text';
 
 /**
  * Component to render a drag-and-drop onto image question.
@@ -88,8 +89,14 @@ export class AddonQtypeDdImageOrTextComponent
             if (this.question.amdArgs[1] !== undefined) {
                 this.question.readOnly = !!this.question.amdArgs[1];
             }
-            if (this.question.amdArgs[2] !== undefined) {
-                this.drops = <unknown[]> this.question.amdArgs[2];
+
+            // Try to get drop info from data attribute (Moodle 5.1+). If not found, fallback to old way of retrieving it.
+            const dropZones = ddArea.querySelector<HTMLElement>('.dropzones');
+            const placeInfo = dropZones?.dataset.placeInfo ?
+                CoreText.parseJSON(dropZones.dataset.placeInfo, null) :
+                this.question.amdArgs[2];
+            if (placeInfo) {
+                this.drops = <unknown[]> placeInfo;
             }
         }
 

src/addons/qtype/ddmarker/component/ddmarker.ts

@@ -21,6 +21,7 @@ import { CoreSites } from '@services/sites';
 import { AddonQtypeDdMarkerQuestion } from '../classes/ddmarker';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreWait } from '@singletons/wait';
+import { CoreText } from '@singletons/text';
 
 /**
  * Component to render a drag-and-drop markers question.
@@ -111,8 +112,14 @@ export class AddonQtypeDdMarkerComponent
             }
             nextIndex++;
 
-            if (this.question.amdArgs[nextIndex] !== undefined) {
-                this.dropZones = <unknown[]> this.question.amdArgs[nextIndex];
+            // Try to get drop zones from data attribute (Moodle 5.1+). If not found, fallback to old way of retrieving it.
+            const dropZones = ddArea.querySelector<HTMLElement>('.dropzones');
+            const visibleDropZones = dropZones?.dataset.visibledDropzones ?
+                CoreText.parseJSON(dropZones.dataset.visibledDropzones, null) :
+                this.question.amdArgs[nextIndex];
+
+            if (visibleDropZones) {
+                this.dropZones = <unknown[]> visibleDropZones;
             }
         }