mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-78176 Question: Fix D&D onto image and D&D markers theme issue

Browse Source
This commit is contained in:
Anupama Sarjoshi 2023-05-11 18:14:33 +01:00
parent 2e1c6fd43e
commit 73d29dc1ce
7 changed files with 28 additions and 18 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

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

@ -55,20 +55,24 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
*/
init: function() {
dragDropToImageForm.fp = dragDropToImageForm.filePickers();
dragDropToImageForm.updateVisibilityOfFilePickers();
dragDropToImageForm.setOptionsForDragItemSelectors();
dragDropToImageForm.setupEventHandlers();
dragDropToImageForm.waitForFilePickerToInitialise();
},
/**
* Add html for the preview area.
*/
setupPreviewArea: function() {
$('#id_previewareaheader').append(
'<div class="ddarea que ddimageortext">' +
' <div class="droparea">' +
' <div id="id_droparea" class="droparea">' +
' <img class="dropbackground" />' +
' <div class="dropzones"></div>' +
' </div>' +
' <div class="dragitems"></div>' +
'</div>');
dragDropToImageForm.updateVisibilityOfFilePickers();
dragDropToImageForm.setOptionsForDragItemSelectors();
dragDropToImageForm.setupEventHandlers();
dragDropToImageForm.waitForFilePickerToInitialise();
},
/**
@ -90,8 +94,13 @@ define(['jquery', 'core/dragdrop'], function($, dragDrop) {
M.util.js_pending('dragDropToImageForm');
dragDropToImageForm.loadPreviewImage();
});
dragDropToImageForm.loadPreviewImage();
if ($('#id_droparea').length) {
dragDropToImageForm.loadPreviewImage();
} else {
// Setup preview area when the background image is uploaded the first time.
dragDropToImageForm.setupPreviewArea();
dragDropToImageForm.loadPreviewImage();
}
},
/**

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

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

@ -374,7 +374,6 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes'], function($, dragDro
init: function() {
dragDropForm.fp = dragDropForm.filePickers();
dragDropForm.noDropZones = dragDropForm.form.getFormValue('nodropzone', []);
dragDropForm.setupPreviewArea();
dragDropForm.setOptionsForDragItemSelectors();
dragDropForm.createShapes();
dragDropForm.setupEventHandlers();
@ -555,7 +554,13 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes'], function($, dragDro
// after filepicker's javascript has finished.
$('form.mform[data-qtype="ddmarker"]').on('change', '#id_bgimage', dragDropForm.loadPreviewImage);
dragDropForm.loadPreviewImage();
if ($('#ddm-droparea').length) {
dragDropForm.loadPreviewImage();
} else {
// Setup preview area when the background image is uploaded the first time.
dragDropForm.setupPreviewArea();
dragDropForm.loadPreviewImage();
}
},
/**

4
question/type/ddmarker/styles.css
View File

@ -227,7 +227,3 @@ body#page-question-type-ddmarker div[id^=fitem_id_][id*=hintclearwrong_] {
body#page-question-type-ddmarker #fitem_id_penalty {
margin-bottom: 2em;
}
body#page-question-type-ddmarker .ddarea.que.ddmarker {
overflow-y: scroll;
}