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

mdo · mdo · commit df8e3c6ee371 · 2012-09-04T20:13:36.000-07:00
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))
       }
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@`
`174`	`174`	`.on('keypress', $.proxy(this.keypress, this))`
`175`	`175`	`.on('keyup', $.proxy(this.keyup, this))`
`176`	`176`
`177`		`- if ($.browser.webkit \|\| $.browser.msie) {`
	`177`	`+ if ($.browser.chrome \|\| $.browser.webkit \|\| $.browser.msie) {`
`178`	`178`	`this.$element.on('keydown', $.proxy(this.keydown, this))`
`179`	`179`	`}`
`180`	`180`