MDL-59858 amd: Focus on the element that actually triggers the modal

diff --git a/lib/amd/build/modal_factory.min.js b/lib/amd/build/modal_factory.min.js
index 04cb7e1..d041bf7 100644 (file)
Binary files a/lib/amd/build/modal_factory.min.js and b/lib/amd/build/modal_factory.min.js differ

diff --git a/lib/amd/src/modal_factory.js b/lib/amd/src/modal_factory.js
index 770ecdf..29acb94 100644 (file)
--- a/lib/amd/src/modal_factory.js
+++ b/lib/amd/src/modal_factory.js
@@ -63,12 +63,15 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
      */
     var setUpTrigger = function(modalPromise, triggerElement) {
         if (typeof triggerElement != 'undefined') {
+            // The element that actually shows the modal.
+            var actualTriggerElement = null;
             if (Array.isArray(triggerElement)) {
                 var selector = triggerElement[1];
                 triggerElement = triggerElement[0];
 
                 CustomEvents.define(triggerElement, [CustomEvents.events.activate]);
                 triggerElement.on(CustomEvents.events.activate, selector, function(e, data) {
+                    actualTriggerElement = e.currentTarget;
                     modalPromise.then(function(modal) {
                         modal.show();
 
@@ -79,6 +82,7 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
             } else {
                 CustomEvents.define(triggerElement, [CustomEvents.events.activate]);
                 triggerElement.on(CustomEvents.events.activate, function(e, data) {
+                    actualTriggerElement = e.currentTarget;
                     modalPromise.then(function(modal) {
                         modal.show();
 
@@ -90,7 +94,10 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
 
             modalPromise.then(function(modal) {
                 modal.getRoot().on(ModalEvents.hidden, function() {
-                    triggerElement.focus();
+                    // Focus on the trigger element that actually launched the modal.
+                    if (actualTriggerElement !== null) {
+                        actualTriggerElement.focus();
+                    }
                 });
 
                 return modal;