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

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

When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown'
Closes #11281 by merging it (after rebasing & resolving conflicts)
d7a3771a · Collin Donahue-Oponski · Chris Rebert · 558e112d · d7a3771a
Commit d7a3771a authored 11 years ago by Collin Donahue-Oponski Committed by Chris Rebert 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- 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