Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

  • Loading branch information...
commit df8e3c6ee3716a3fad45bff08fafc29c55967515 2 parents bc4ecd9 + 9341bb7
@mdo mdo authored
Showing with 8 additions and 1 deletion.
  1. +7 −0 Makefile
  2. +1 −1  js/bootstrap-typeahead.js
View
7 Makefile
@@ -51,6 +51,13 @@ test:
rm js/tests/pid.txt
#
+# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
+#
+
+clean:
+ rm -r bootstrap
+
+#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
#
View
2  js/bootstrap-typeahead.js
@@ -174,7 +174,7 @@
.on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this))
- if ($.browser.webkit || $.browser.msie) {
+ if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keydown, this))
}
Please sign in to comment.
Something went wrong with that request. Please try again.