MDL-63714 theme_boost: Fix aria focus behat issues

diff --git a/theme/boost/amd/build/aria.min.js b/theme/boost/amd/build/aria.min.js
index b823d5c..bd07aec 100644 (file)
Binary files a/theme/boost/amd/build/aria.min.js and b/theme/boost/amd/build/aria.min.js differ

diff --git a/theme/boost/amd/src/aria.js b/theme/boost/amd/src/aria.js
index aacfba2..60651c9 100644 (file)
--- a/theme/boost/amd/src/aria.js
+++ b/theme/boost/amd/src/aria.js
@@ -65,8 +65,10 @@ define(['jquery'], function($) {
 
             // Special handling for navigation keys when menu is open.
             var shiftFocus = function(element) {
+                M.util.pending_js('core/aria:delayed-focus');
                 var delayedFocus = function() {
                     $(this).focus();
+                    M.util.complete_js('core/aria:delayed-focus');
                 }.bind(element);
                 setTimeout(delayedFocus, 50);
             };
@@ -186,12 +188,14 @@ define(['jquery'], function($) {
 
             // After page load, focus on any element with special autofocus attribute.
             $(function() {
+                M.util.pending_js('core/aria:delayed-focus');
                 window.setTimeout(function() {
                     var alerts = $('[role="alert"][data-aria-autofocus="true"]');
                     if (alerts.length > 0) {
                         $(alerts[0]).attr('tabindex', '0');
                         $(alerts[0]).focus();
                     }
+                    M.util.complete_js('core/aria:delayed-focus');
                 }, 300);
             });
         }