diff options
author | fat <jacobthornton@gmail.com> | 2013-05-27 23:48:16 +0400 |
---|---|---|
committer | fat <jacobthornton@gmail.com> | 2013-05-27 23:48:16 +0400 |
commit | a7a87c8e8c3343f6d9dea868d578178de8907f98 (patch) | |
tree | 12c6d767e653d874786e0c51d194fc58f22c2369 /docs/assets/js/bootstrap.js | |
parent | 9257bdc0974beef0a2218c76851dc37f3cf9313a (diff) |
rebuild
Diffstat (limited to 'docs/assets/js/bootstrap.js')
-rw-r--r-- | docs/assets/js/bootstrap.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 69b9b94abe..4ec229c8ac 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1100,7 +1100,7 @@ return options } - Tooltip.prototype.enter = function (e) { + Tooltip.prototype.enter = function (obj) { var defaults = this.getDefaults() var options = {} @@ -1108,26 +1108,29 @@ if (defaults[key] != value) options[key] = value }) - var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](options).data('bs.' + this.type) if (!self.options.delay || !self.options.delay.show) return self.show() clearTimeout(this.timeout) self.hoverState = 'in' - this.timeout = setTimeout(function() { + this.timeout = setTimeout(function () { if (self.hoverState == 'in') self.show() }, self.options.delay.show) } - Tooltip.prototype.leave = function (e) { - var self = $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type) + + clearTimeout(this.timeout) - if (this.timeout) clearTimeout(this.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() self.hoverState = 'out' - this.timeout = setTimeout(function() { + this.timeout = setTimeout(function () { if (self.hoverState == 'out') self.hide() }, self.options.delay.hide) } @@ -1324,7 +1327,7 @@ Tooltip.prototype.toggle = function (e) { var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this - self.tip().hasClass('in') ? self.leave(e) : self.enter(e) + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) } Tooltip.prototype.destroy = function () { |