From d7a3771abde2bffedf0547c800cf84f97a252e34 Mon Sep 17 00:00:00 2001 From: Collin Donahue-Oponski <collindo@gmail.com> Date: Tue, 29 Oct 2013 19:56:09 -0600 Subject: [PATCH] When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown' Closes #11281 by merging it (after rebasing & resolving conflicts) --- js/dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/dropdown.js b/js/dropdown.js index b35ce562d0..905ee3979e 100644 --- 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 -- GitLab