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

myxt · Sep 5, 2012 · df8e3c6 · df8e3c6
2 parents bc4ecd9 + 9341bb7
commit df8e3c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -50,6 +50,13 @@ test:
 	kill -9 `cat js/tests/pid.txt`
 	rm js/tests/pid.txt
 
+#
+# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
+#
+
+clean:
+	rm -r bootstrap
+
 #
 # BUILD SIMPLE BOOTSTRAP DIRECTORY
 # recess & uglifyjs are required

diff --git a/js/bootstrap-typeahead.js b/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))
       }