diff options
author | fat <jacobthornton@gmail.com> | 2012-12-20 09:55:23 +0400 |
---|---|---|
committer | fat <jacobthornton@gmail.com> | 2012-12-20 09:55:23 +0400 |
commit | dc4e80a655509dc1f68d45c950174e79da2f7f08 (patch) | |
tree | dc08ea4d1536627939cb0a3f4740c24b98fb27db /js | |
parent | 5bd8cdca91615dfb502131c276bfc6d8457c5f79 (diff) |
fix ghetto ass timeout shit
Diffstat (limited to 'js')
-rw-r--r-- | js/bootstrap-typeahead.js | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 8324e0664a..8d31954b1e 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -172,6 +172,7 @@ , listen: function () { this.$element + .on('focus', $.proxy(this.focus, this)) .on('blur', $.proxy(this.blur, this)) .on('keypress', $.proxy(this.keypress, this)) .on('keyup', $.proxy(this.keyup, this)) @@ -183,6 +184,7 @@ this.$menu .on('click', $.proxy(this.click, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) } , eventSupported: function(eventName) { @@ -256,9 +258,13 @@ e.preventDefault() } + , focus: function (e) { + this.focused = true + } + , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) + this.focused = false + if (!this.mousedover && this.shown) this.hide() } , click: function (e) { @@ -268,10 +274,16 @@ } , mouseenter: function (e) { + this.mousedover = true this.$menu.find('.active').removeClass('active') $(e.currentTarget).addClass('active') } + , mouseleave: function (e) { + this.mousedover = false + if (!this.focused && this.shown) this.hide() + } + } |