aboutsummaryrefslogtreecommitdiff
path: root/js/dropdown.js
diff options
context:
space:
mode:
authorEmmanuel Bourgerie <[email protected]>2015-03-16 13:33:42 +0000
committerChris Rebert <[email protected]>2015-03-21 16:00:15 -0700
commitfa9d28b634dbcf057778cd755bc52aedebffbe22 (patch)
tree0f3af5490e84be3f4545db38a5a2fac73da57d14 /js/dropdown.js
parent74ae498800fdd806b4a7edc0d6157c915911f989 (diff)
downloadbootstrap-fa9d28b634dbcf057778cd755bc52aedebffbe22.tar.xz
bootstrap-fa9d28b634dbcf057778cd755bc52aedebffbe22.zip
Fix #16072: Clicking into input field within dropdown no longer closes the dropdown
Closes #16073 by merging it
Diffstat (limited to 'js/dropdown.js')
-rw-r--r--js/dropdown.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/dropdown.js b/js/dropdown.js
index 5e6cefe84..1fbf74a31 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -99,6 +99,8 @@
if (!$parent.hasClass('open')) return
+ if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
+
$parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
if (e.isDefaultPrevented()) return