Permalink
Browse files

Fix #4550

  • Loading branch information...
1 parent 3b3dd3a commit 7bd46eadbcb8730d588676c538712f4f57ffebab @xiaogaozi committed Nov 8, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +3 −2 js/bootstrap-dropdown.js
View
@@ -35,3 +35,4 @@ nbproject
.idea
node_modules
dist
+bootstrap
@@ -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);

0 comments on commit 7bd46ea

Please sign in to comment.