mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Víctor Déniz 2020-11-04 19:17:04 +00:00
commit 65bb82c7c8
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
question/type/ddimageortext/amd/build/form.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
question/type/ddimageortext/amd/build/form.min.js.map
View File

File diff suppressed because one or more lines are too long

6
question/type/ddimageortext/amd/src/form.js
View File

@ -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;

2
question/type/ddmarker/amd/build/form.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
question/type/ddmarker/amd/build/form.min.js.map
View File

File diff suppressed because one or more lines are too long

4
question/type/ddmarker/amd/src/form.js
View File

@ -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)];
},

2
question/type/edit_question_form.php
View File

@ -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);
}
/**