From fa9d28b634dbcf057778cd755bc52aedebffbe22 Mon Sep 17 00:00:00 2001
From: Emmanuel Bourgerie <emmanuel.bourgerie@teamaol.com>
Date: Mon, 16 Mar 2015 13:33:42 +0000
Subject: Fix #16072: Clicking into input field within dropdown no longer
 closes the dropdown

Closes #16073 by merging it
---
 js/dropdown.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/dropdown.js')

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
-- 
cgit v1.2.3