mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity

MDL-71145 qtype_ddmarker: Incorrect marker positions in responsive mode

Browse Source
This commit is contained in:
Huong Nguyen 2021-04-12 15:59:00 +07:00
parent efb3d4e7a7
commit 9079814421
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

6
question/type/ddmarker/amd/src/question.js
View File

@ -303,6 +303,10 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes', 'core/key_codes'], f
items.each(function() {
var drag = $(this);
if (!drag.hasClass('beingdragged')) {
if (drag.data('scaleRatio') !== bgRatio) {
// The scale ratio for the draggable item was changed. We need to update that.
drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);
}
var dragXY = new Shapes.Point(drag.data('pagex'), drag.data('pagey'));
if (thiQ.coordsInBgImg(dragXY)) {
var bgImgXY = thiQ.convertToBgImgXY(dragXY);
@ -564,6 +568,8 @@ define(['jquery', 'core/dragdrop', 'qtype_ddmarker/shapes', 'core/key_codes'], f
drag.data('originX', dragXY.x).data('originY', dragXY.y);
drag.css('left', dragXY.x * bgRatio).css('top', dragXY.y * bgRatio);
}
// We need to save the original scale ratio for each draggable item.
drag.data('scaleRatio', bgRatio);
dropArea.append(drag);
this.handleElementScale(drag, 'left top');
};

14
question/type/ddmarker/tests/behat/preview.feature
View File

@ -56,3 +56,17 @@ Feature: Preview a drag-drop marker question
Then the state of "Please place the markers on the map of Milton Keynes" question is shown as "Partially correct"
And I should see "Mark 0.25 out of 1.00"
And I switch to the main window
@javascript
Scenario: Preview a question in responsive mode.
When I choose "Preview" action for "Drag markers" in the question bank
And I switch to "questionpreview" window
And I change window size to "large"
And I drag "OU" to "345,230" in the drag and drop markers question
And I drag "Railway station" to "262,197" in the drag and drop markers question
And I drag "Railway station" to "334,319" in the drag and drop markers question
And I change window size to "360x640"
And I drag "Railway station" to "165,75" in the drag and drop markers question
And I press "Submit and finish"
Then the state of "Please place the markers on the map of Milton Keynes" question is shown as "Correct"
And I should see "Mark 1.00 out of 1.00"