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

MDL-72523 javascript: Introduce setReturnElement for core/modal

Browse Source
This commit is contained in:
Huong Nguyen 2022-10-17 16:20:27 +07:00 committed by Paul Holden
parent 15a695d573
commit 887f193c38
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/amd/build/modal.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/amd/build/modal.min.js.map
View File

File diff suppressed because one or more lines are too long

22
lib/amd/src/modal.js
View File

@ -103,6 +103,7 @@ define([
this.modalCount = modalCounter++;
this.attachmentPoint = document.createElement('div');
document.body.append(this.attachmentPoint);
this.focusOnClose = null;
if (!this.root.is(SELECTORS.CONTAINER)) {
Notification.exception({message: 'Element is not a modal container'});
@ -693,6 +694,11 @@ define([
this.attachToDOM();
// If the focusOnClose was not set. Set the focus back to triggered element.
if (!this.focusOnClose && document.activeElement) {
this.focusOnClose = document.activeElement;
}
return this.getBackdrop()
.then(function(backdrop) {
var currentIndex = this.calculateZIndex();
@ -850,6 +856,13 @@ define([
this.hide();
data.originalEvent.preventDefault();
}.bind(this));
this.getRoot().on(ModalEvents.hidden, () => {
if (this.focusOnClose) {
// Focus on the element that actually triggers the modal.
this.focusOnClose.focus();
}
});
};
/**
@ -962,5 +975,14 @@ define([
this.removeOnClose = remove;
};
/**
* Set the return element for the modal.
*
* @param {Element|jQuery} element Element to focus when the modal is closed
*/
Modal.prototype.setReturnElement = function(element) {
this.focusOnClose = element;
};
return Modal;
});