mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-27 11:23:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71087-master' of https://github.com/NashTechOpenUniversity/moodle

Browse Source
This commit is contained in:
Víctor Déniz 2021-04-19 23:44:06 +01:00
commit ab6f97292d
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/form/filemanager.js
View File

@ -238,7 +238,7 @@ M.form_filemanager.init = function(Y, options) {
}, true); }, true);
}, },
/** displays message in a popup */ /** displays message in a popup */
print_msg: function(msg, type) { print_msg: function(msg, type, options) {
var header = M.util.get_string('error', 'moodle'); var header = M.util.get_string('error', 'moodle');
if (type != 'error') { if (type != 'error') {
type = 'info'; // one of only two types excepted type = 'info'; // one of only two types excepted
@ -247,13 +247,17 @@ M.form_filemanager.init = function(Y, options) {
if (!this.msg_dlg) { if (!this.msg_dlg) {
this.msg_dlg_node = Y.Node.create(M.form_filemanager.templates.message); this.msg_dlg_node = Y.Node.create(M.form_filemanager.templates.message);
var nodeid = this.msg_dlg_node.generateID(); var nodeid = this.msg_dlg_node.generateID();
var previousActiveElement = null;
if (typeof options.previousActiveElement != 'undefined') {
previousActiveElement = options.previousActiveElement;
}
this.msg_dlg = new M.core.dialogue({ this.msg_dlg = new M.core.dialogue({
draggable : true, draggable : true,
bodyContent : this.msg_dlg_node, bodyContent : this.msg_dlg_node,
centered : true, centered : true,
modal : true, modal : true,
visible : false, visible : false,
focusAfterHide: previousActiveElement,
}); });
this.msg_dlg_node.one('.fp-msg-butok').on('click', function(e) { this.msg_dlg_node.one('.fp-msg-butok').on('click', function(e) {
e.preventDefault(); e.preventDefault();
@ -350,6 +354,7 @@ M.form_filemanager.init = function(Y, options) {
centered : true, centered : true,
modal : true, modal : true,
visible : false, visible : false,
focusAfterHide: e.target.ancestor('a', true),
}); });
node.one('.fp-dlg-butcreate').set('id', 'fm-mkdir-butcreate-'+this.client_id).on('click', node.one('.fp-dlg-butcreate').set('id', 'fm-mkdir-butcreate-'+this.client_id).on('click',
perform_action, this); perform_action, this);
@ -427,9 +432,12 @@ M.form_filemanager.init = function(Y, options) {
e.preventDefault(); e.preventDefault();
var dialogOptions = {}; var dialogOptions = {};
var filenames = this.getSelectedFiles(); var filenames = this.getSelectedFiles();
var previousActiveElement = e.target.ancestor('a', true);
if (!filenames.length) { if (!filenames.length) {
this.print_msg(M.util.get_string('nofilesselected', 'repository'), 'error'); var options = {};
options.previousActiveElement = previousActiveElement;
this.print_msg(M.util.get_string('nofilesselected', 'repository'), 'error', options);
return; return;
} }
@ -439,6 +447,7 @@ M.form_filemanager.init = function(Y, options) {
}; };
dialogOptions.header = M.util.get_string('confirm', 'moodle'); dialogOptions.header = M.util.get_string('confirm', 'moodle');
dialogOptions.message = M.util.get_string('confirmdeleteselectedfile', 'repository', filenames.length); dialogOptions.message = M.util.get_string('confirmdeleteselectedfile', 'repository', filenames.length);
dialogOptions.previousActiveElement = previousActiveElement;
dialogOptions.callbackargs = [params]; dialogOptions.callbackargs = [params];
dialogOptions.callback = function(params) { dialogOptions.callback = function(params) {
this.request({ this.request({
@ -861,13 +870,20 @@ M.form_filemanager.init = function(Y, options) {
this.confirm_dlg_node = Y.Node.create(M.form_filemanager.templates.confirmdialog); this.confirm_dlg_node = Y.Node.create(M.form_filemanager.templates.confirmdialog);
var node = this.confirm_dlg_node; var node = this.confirm_dlg_node;
node.generateID(); node.generateID();
var previousActiveElement = null;
if (typeof dialog_options.previousActiveElement != 'undefined') {
previousActiveElement = dialog_options.previousActiveElement;
}
this.confirm_dlg = new M.core.dialogue({ this.confirm_dlg = new M.core.dialogue({
draggable : true, draggable : true,
bodyContent : node, bodyContent : node,
centered : true, centered : true,
modal : true, modal : true,
visible : false, visible : false,
buttons : {} buttons : {},
focusAfterHide: previousActiveElement,
}); });
var handle_confirm = function(ev) { var handle_confirm = function(ev) {
var dlgopt = this.confirm_dlg.dlgopt; var dlgopt = this.confirm_dlg.dlgopt;