mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 08:04:59 +02:00
Code Issues Releases Wiki Activity

fix regression in typeahead #3313

Browse Source
This commit is contained in:
Jacob Thornton
2012-06-02 19:31:30 -07:00
parent 354f99f0bd
commit 0b827965d3
4 changed files with 102 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
docs/assets/js/bootstrap-typeahead.js vendored
View File

@@ -169,7 +169,7 @@
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) { if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keypress, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
this.$menu this.$menu
@@ -177,6 +177,38 @@
.on('mouseenter', 'li', $.proxy(this.mouseenter, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
} }
, move: function (e) {
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, keydown: function (e) {
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
this.move(e)
}
, keypress: function (e) {
if (!this.shown || this.suppressKeyPressRepeat) return
this.move(e)
}
, keyup: function (e) { , keyup: function (e) {
switch(e.keyCode) { switch(e.keyCode) {
case 40: // down arrow case 40: // down arrow
@@ -202,32 +234,6 @@
e.preventDefault() e.preventDefault()
} }
, keypress: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault()
this.prev()
break
case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, blur: function (e) { , blur: function (e) {
var that = this var that = this
setTimeout(function () { that.hide() }, 150) setTimeout(function () { that.hide() }, 150)

60
docs/assets/js/bootstrap.js vendored
View File

@@ -1763,7 +1763,7 @@
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) { if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keypress, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
this.$menu this.$menu
@@ -1771,6 +1771,38 @@
.on('mouseenter', 'li', $.proxy(this.mouseenter, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
} }
, move: function (e) {
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, keydown: function (e) {
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
this.move(e)
}
, keypress: function (e) {
if (!this.shown || this.suppressKeyPressRepeat) return
this.move(e)
}
, keyup: function (e) { , keyup: function (e) {
switch(e.keyCode) { switch(e.keyCode) {
case 40: // down arrow case 40: // down arrow
@@ -1796,32 +1828,6 @@
e.preventDefault() e.preventDefault()
} }
, keypress: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault()
this.prev()
break
case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, blur: function (e) { , blur: function (e) {
var that = this var that = this
setTimeout(function () { that.hide() }, 150) setTimeout(function () { that.hide() }, 150)

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

62
js/bootstrap-typeahead.js vendored
View File

@@ -169,7 +169,7 @@
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) { if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keypress, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
this.$menu this.$menu
@@ -177,6 +177,40 @@
.on('mouseenter', 'li', $.proxy(this.mouseenter, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
} }
, move: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, keydown: function (e) {
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
this.move(e)
}
, keypress: function (e) {
if (this.suppressKeyPressRepeat) return
this.move(e)
}
, keyup: function (e) { , keyup: function (e) {
switch(e.keyCode) { switch(e.keyCode) {
case 40: // down arrow case 40: // down arrow
@@ -202,32 +236,6 @@
e.preventDefault() e.preventDefault()
} }
, keypress: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault()
this.prev()
break
case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, blur: function (e) { , blur: function (e) {
var that = this var that = this
setTimeout(function () { that.hide() }, 150) setTimeout(function () { that.hide() }, 150)