Merge branch 'MDL-68344-3.9' of https://github.com/JBThong/moodle into MOODLE_39_STABLE

2020-09-08 08:45:19 +02:00
parent 6bbb402129 3b45e0db41
commit ec52cca8b1
2 changed files with 4 additions and 1 deletions
@@ -493,6 +493,7 @@ M.form_filemanager.init = function(Y, options) {
            // XXX: magic here, to let filepicker use filemanager scope
            options.magicscope = this;
            options.savepath = this.currentpath;
+            options.previousActiveElement = e.target.ancestor('a', true);
            M.core_filepicker.show(Y, options);
        },

@@ -1422,7 +1422,9 @@ M.core_filepicker.init = function(Y, options) {
                width        : width+'px',
                responsiveWidth : 768,
                height       : '558px',
-                zIndex       : this.options.zIndex
+                zIndex       : this.options.zIndex,
+                focusOnPreviousTargetAfterHide: true,
+                focusAfterHide: this.options.previousActiveElement
            });

            // create panel for selecting a file (initially hidden)