Merge branch 'MDL-70112_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE

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

@@ -82,7 +82,7 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
             // From now on, when a new file gets loaded into the filepicker, update the preview.
             // This is not in the setupEventHandlers section as it needs to be delayed until
             // after filepicker's javascript has finished.
-            $('form.mform').on('change', '.filepickerhidden', function() {
+            $('form.mform[data-qtype="ddimageortext"]').on('change', '.filepickerhidden', function() {
                 M.util.js_pending('dragDropToImageForm');
                 dragDropToImageForm.loadPreviewImage();
             });
@@ -428,7 +428,7 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
             },
 
             getEl: function(name, indexes) {
-                var form = $('form.mform')[0];
+                var form = $('form.mform[data-qtype="ddimageortext"]')[0];
                 return form.elements[this.toNameWithIndex(name, indexes)];
             },
 
@@ -479,7 +479,7 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
             if (draftItemIdsToName === undefined) {
                 draftItemIdsToName = {};
                 nameToParentNode = {};
-                var fp = $('form.mform input.filepickerhidden');
+                var fp = $('form.mform[data-qtype="ddimageortext"] input.filepickerhidden');
                 fp.each(function(index, filepicker) {
                     draftItemIdsToName[filepicker.value] = filepicker.name;
                     nameToParentNode[filepicker.name] = filepicker.parentNode;

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

@@ -554,7 +554,7 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes'], function($, dragDro
             // From now on, when a new file gets loaded into the filepicker, update the preview.
             // This is not in the setupEventHandlers section as it needs to be delayed until
             // after filepicker's javascript has finished.
-            $('form.mform').on('change', '#id_bgimage', dragDropForm.loadPreviewImage);
+            $('form.mform[data-qtype="ddmarker"]').on('change', '#id_bgimage', dragDropForm.loadPreviewImage);
 
             dragDropForm.loadPreviewImage();
         },
@@ -645,7 +645,7 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes'], function($, dragDro
             },
 
             getEl: function(name, indexes) {
-                var form = $('form.mform')[0];
+                var form = $('form.mform[data-qtype="ddmarker"]')[0];
                 return form.elements[this.toNameWithIndex(name, indexes)];
             },
 

question/type/edit_question_form.php

@@ -110,7 +110,7 @@ abstract class question_edit_form extends question_wizard_form {
         $this->category = $category;
         $this->categorycontext = context::instance_by_id($category->contextid);
 
-        parent::__construct($submiturl, null, 'post', '', null, $formeditable);
+        parent::__construct($submiturl, null, 'post', '', ['data-qtype' => $this->qtype()], $formeditable);
     }
 
     /**