mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 01:43:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68549 Drag-drop into text: minor glitches caused by MDL-68113

Browse Source
This commit is contained in:
Huong Nguyen 2020-05-08 19:37:50 +07:00
parent a09eb2697f
commit 1937957be3
3 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

59
question/type/ddwtos/amd/src/ddwtos.js
View File

@ -314,11 +314,11 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
// Is there already a drag in this drop? if so, evict it.
var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));
if (oldDrag.length !== 0) {
oldDrag.addClass('beingdragged');
oldDrag.offset(oldDrag.offset());
var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');
var hiddenDrop = this.getDrop(oldDrag, currentPlace);
hiddenDrop.addClass('active');
oldDrag.addClass('beingdragged');
oldDrag.offset(hiddenDrop.offset());
this.sendDragHome(oldDrag);
}
@ -387,11 +387,33 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
break;
default:
questionManager.isKeyboardNavigation = false;
return; // To avoid the preventDefault below.
}
if (nextDrag.length) {
nextDrag.data('isfocus', true);
nextDrag.addClass('beingdragged');
var hiddenDrag = this.getDragClone(nextDrag);
if (hiddenDrag.length) {
if (nextDrag.hasClass('infinite')) {
var noOfDrags = this.noOfDropsInGroup(this.getGroup(nextDrag));
var cloneDrags = this.getInfiniteDragClones(nextDrag, false);
if (cloneDrags.length < noOfDrags) {
var cloneDrag = nextDrag.clone();
cloneDrag.removeClass('beingdragged');
cloneDrag.removeAttr('tabindex');
hiddenDrag.after(cloneDrag);
nextDrag.offset(cloneDrag.offset());
} else {
hiddenDrag.addClass('active');
nextDrag.offset(hiddenDrag.offset());
}
} else {
hiddenDrag.addClass('active');
nextDrag.offset(hiddenDrag.offset());
}
}
} else {
drop.data('isfocus', true);
}
@ -688,6 +710,11 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
*/
eventHandlersInitialised: false,
/**
* {boolean} is keyboard navigation or not.
*/
isKeyboardNavigation: false,
/**
* {DragDropToTextQuestion[]} all the questions on this page, indexed by containerId (id on the .que div).
*/
@ -740,6 +767,10 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
* @param {KeyboardEvent} e
*/
handleKeyPress: function(e) {
if (questionManager.isKeyboardNavigation) {
return;
}
questionManager.isKeyboardNavigation = true;
var question = questionManager.getQuestionForEvent(e);
if (question) {
question.handleKeyPress(e);
@ -775,35 +806,19 @@ define(['jquery', 'core/dragdrop', 'core/key_codes'], function($, dragDrop, keys
drag.removeAttr('tabindex');
drag.removeData('unplaced');
if (drag.hasClass('infinite') && thisQ.getInfiniteDragClones(drag, true).length > 1) {
setTimeout(function() {
thisQ.getInfiniteDragClones(drag, true).first().remove();
});
thisQ.getInfiniteDragClones(drag, true).first().remove();
}
}
if (typeof drag.data('isfocus') !== 'undefined' && drag.data('isfocus') === true) {
var hiddenDrag = thisQ.getDragClone(drag);
if (hiddenDrag.length) {
if (drag.hasClass('infinite')) {
var noOfDrags = thisQ.noOfDropsInGroup(thisQ.getGroup(drag));
var cloneDrags = thisQ.getInfiniteDragClones(drag, false);
if (cloneDrags.length < noOfDrags) {
var cloneDrag = drag.clone();
cloneDrag.removeClass('beingdragged');
cloneDrag.removeAttr('tabindex');
hiddenDrag.after(cloneDrag);
} else {
hiddenDrag.addClass('active');
}
} else {
hiddenDrag.addClass('active');
}
}
drag.focus();
drag.removeData('isfocus');
}
if (typeof target.data('isfocus') !== 'undefined' && target.data('isfocus') === true) {
target.removeData('isfocus');
}
if (questionManager.isKeyboardNavigation) {
questionManager.isKeyboardNavigation = false;
}
}
};