vendor/assets/javascripts/twitter/bootstrap/tooltip.js in bootstrap-sass-rails-2.0.3.0 vs vendor/assets/javascripts/twitter/bootstrap/tooltip.js in bootstrap-sass-rails-2.0.4.0

- old
+ new

@@ -1,7 +1,7 @@ /* =========================================================== - * bootstrap-tooltip.js v2.0.3 + * bootstrap-tooltip.js v2.0.4 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. * @@ -82,13 +82,13 @@ } , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) + if (this.timeout) clearTimeout(this.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() - clearTimeout(this.timeout) self.hoverState = 'out' this.timeout = setTimeout(function() { if (self.hoverState == 'out') self.hide() }, self.options.delay.hide) } @@ -270,6 +270,6 @@ , trigger: 'hover' , title: '' , delay: 0 } -}(window.jQuery); \ No newline at end of file +}(window.jQuery);