From e22a73fd381edef4620a758099e5c16ae1168e85 Mon Sep 17 00:00:00 2001
From: Bootstrap's Grunt bot <twbs-grunt@users.noreply.github.com>
Date: Sat, 21 Mar 2015 23:10:30 +0000
Subject: automatic `grunt dist`

---
 dist/js/bootstrap.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dist/js/bootstrap.js')

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 51be48730..e431bb47e 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -839,6 +839,8 @@ if (typeof jQuery === 'undefined') {
 
       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