Fix twbs#4550

xiaogaozi · Nov 8, 2012 · 7bd46ea · 7bd46ea
1 parent 3b3dd3a
commit 7bd46ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ nbproject
 .idea
 node_modules
 dist
+bootstrap
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
@@ -142,7 +142,8 @@
   $(document)
     .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
     .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('touchstart.dropdown.data-api', '.dropdown-menu', function(e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
-}(window.jQuery);
+}(window.jQuery);