From: Collin Donahue-Oponski Date: Wed, 30 Oct 2013 01:56:09 +0000 (-0600) Subject: When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs... X-Git-Tag: v3.2.0~259 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7a3771abde2bffedf0547c800cf84f97a252e34;p=thirdparty%2Fbootstrap.git When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown' Closes #11281 by merging it (after rebasing & resolving conflicts) --- 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