rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2012-09-04 20:13:36 -07:00
commit df8e3c6ee3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -50,6 +50,13 @@ test:
kill -9 `cat js/tests/pid.txt` kill -9 `cat js/tests/pid.txt`
rm js/tests/pid.txt rm js/tests/pid.txt
#
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
#
clean:
rm -r bootstrap
# #
# BUILD SIMPLE BOOTSTRAP DIRECTORY # BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required # recess & uglifyjs are required

2
js/bootstrap-typeahead.js vendored
View File

@ -174,7 +174,7 @@
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, 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)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }