diff options
| author | Mark Otto <[email protected]> | 2013-07-23 23:48:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-23 23:48:32 -0700 |
| commit | 8540515eebf8b17286cb27f6d1804352dada875d (patch) | |
| tree | c9c92d7ca9de7a88d656f14567d1b60d14242289 /js | |
| parent | 18157e9f390cc1dd389604c215017650400377a3 (diff) | |
| parent | 3cfa1c8a30beb081167105b7ea006e9089e566f5 (diff) | |
| download | bootstrap-8540515eebf8b17286cb27f6d1804352dada875d.tar.xz bootstrap-8540515eebf8b17286cb27f6d1804352dada875d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/tooltip.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index f8ba0aacb..102550594 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -104,10 +104,10 @@ if (!self.options.delay || !self.options.delay.show) return self.show() - clearTimeout(this.timeout) + clearTimeout(self.timeout) self.hoverState = 'in' - this.timeout = setTimeout(function () { + self.timeout = setTimeout(function () { if (self.hoverState == 'in') self.show() }, self.options.delay.show) } @@ -116,12 +116,12 @@ var self = obj instanceof this.constructor ? obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type) - clearTimeout(this.timeout) + clearTimeout(self.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() self.hoverState = 'out' - this.timeout = setTimeout(function () { + self.timeout = setTimeout(function () { if (self.hoverState == 'out') self.hide() }, self.options.delay.hide) } |