When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs...

Closes #11281 by merging it (after rebasing & resolving conflicts)

diff --git a/js/dropdown.js b/js/dropdown.js
index b35ce562d000cc823ebaa52e9e2a559b9c8f30a0..905ee3979e0b20aa0a72019f0ce57328e266f815 100644 (file)
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -40,11 +40,11 @@
 
       if (e.isDefaultPrevented()) return
 
+      $this.trigger('focus')
+
       $parent
         .toggleClass('open')
         .trigger('shown.bs.dropdown', relatedTarget)
-
-      $this.trigger('focus')
     }
 
     return false