From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Thu, 23 Oct 2014 04:13:46 +0000 (+0200)
Subject: Merge pull request #14669 from vsn4ik/dropdown_event_target
X-Git-Tag: v3.3.0~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe511484343064a344d64cfedd5b10bfb2409823;p=thirdparty%2Fbootstrap.git

Merge pull request #14669 from vsn4ik/dropdown_event_target

Use e.target instead :focus selector.
---

fe511484343064a344d64cfedd5b10bfb2409823
diff --cc js/dropdown.js
index 8fa712775a,ccdf1635f6..7388f81246
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@@ -77,10 -77,10 +77,10 @@@
  
      if (!$items.length) return
  
-     var index = $items.index($items.filter(':focus'))
+     var index = $items.index(e.target)
  
 -    if (e.keyCode == 38 && index > 0)                 index--                        // up
 -    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
 +    if (e.which == 38 && index > 0)                 index--                        // up
 +    if (e.which == 40 && index < $items.length - 1) index++                        // down
      if (!~index)                                      index = 0
  
      $items.eq(index).trigger('focus')