Dialog returns focus to previous element after closing (#12824)

Jerhamre · petetnt · commit 4b26e9d44811 · 2016-10-16T15:32:11.000+03:00
* Update showModalDialogUsingTemplate() to save current focus when creating a dialog and set current focus to the previous one when closing

* added a null check for rare cases when document.activeElement is null

* Add missing whitespace

* A bit more whitespace
diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js
@@ -305,6 +305,9 @@ define(function (require, exports, module) {
             return _keydownHook.call($dlg, e, autoDismiss);
         };
 
+        // Store current focus
+        var lastFocus = window.document.activeElement;
+
         // Pipe dialog-closing notification back to client code
         $dlg.one("hidden", function () {
             var buttonId = $dlg.data("buttonId");
@@ -325,6 +328,11 @@ define(function (require, exports, module) {
             // Remove our global keydown handler.
             KeyBindingManager.removeGlobalKeydownHook(keydownHook);
 
+            // Restore previous focus
+            if (lastFocus) {
+                lastFocus.focus();    
+            }
+
             //Remove wrapper
             $(".modal-wrapper:last").remove();
         }).one("shown", function () {
