diff options
| author | Collin Donahue-Oponski <[email protected]> | 2013-10-29 19:56:09 -0600 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-04-08 22:36:21 -0700 |
| commit | d7a3771abde2bffedf0547c800cf84f97a252e34 (patch) | |
| tree | fb9b855b7e7fd97fe4d831f02cafecdf3dbae387 | |
| parent | 558e112de46213b352415f68eb3e05460e53be1b (diff) | |
| download | bootstrap-d7a3771abde2bffedf0547c800cf84f97a252e34.tar.xz bootstrap-d7a3771abde2bffedf0547c800cf84f97a252e34.zip | |
When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown'
Closes #11281 by merging it (after rebasing & resolving conflicts)
| -rw-r--r-- | js/dropdown.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/dropdown.js b/js/dropdown.js index b35ce562d..905ee3979 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 |