Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--js/bootstrap-typeahead.js2
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a2abea93d0..3d6ac401dc 100644
--- a/Makefile
+++ b/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
#
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 6ceacd61dc..c2ccdea218 100644
--- 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))
}