diff options
author | Thomas Park <thomas@thomaspark.me> | 2013-08-19 20:05:19 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2013-08-19 20:05:19 -0400 |
commit | 424dd8bc118b36c9173dbdc05661086c8566fd17 (patch) | |
tree | 6e8d8f9c4aa7b1bd209448f5ac7d78b4e983b573 /bower_components/bootstrap/js/tooltip.js | |
parent | d29efdf7b225badbee54f074400c996be7159233 (diff) |
update bootstrap to 3.0.0 final
Diffstat (limited to 'bower_components/bootstrap/js/tooltip.js')
-rwxr-xr-x | bower_components/bootstrap/js/tooltip.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bower_components/bootstrap/js/tooltip.js b/bower_components/bootstrap/js/tooltip.js index e0732a5a..89802287 100755 --- a/bower_components/bootstrap/js/tooltip.js +++ b/bower_components/bootstrap/js/tooltip.js @@ -108,10 +108,11 @@ clearTimeout(self.timeout) + self.hoverState = 'in' + if (!self.options.delay || !self.options.delay.show) return self.show() - self.hoverState = 'in' - self.timeout = setTimeout(function () { + self.timeout = setTimeout(function () { if (self.hoverState == 'in') self.show() }, self.options.delay.show) } @@ -122,10 +123,11 @@ clearTimeout(self.timeout) + self.hoverState = 'out' + if (!self.options.delay || !self.options.delay.hide) return self.hide() - self.hoverState = 'out' - self.timeout = setTimeout(function () { + self.timeout = setTimeout(function () { if (self.hoverState == 'out') self.hide() }, self.options.delay.hide) } @@ -258,7 +260,9 @@ var $tip = this.tip() var e = $.Event('hide.bs.' + this.type) - function complete() { $tip.detach() } + function complete() { + if (that.hoverState != 'in') $tip.detach() + } this.$element.trigger(e) |