diff options
| author | Mark Otto <[email protected]> | 2013-12-26 19:08:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-26 19:08:34 -0800 |
| commit | ca7498faa0c0dc4f29c4d47764e88d3d277dc6f9 (patch) | |
| tree | b95817945dbc048e82d29c260507233d5a7bd6da /js/tooltip.js | |
| parent | 567dc12e86d76fa1dd7395c4251a75068558b2de (diff) | |
| parent | cd0ad94aae42926e2bf86c2f14c6a8856c9b34ff (diff) | |
| download | bootstrap-ca7498faa0c0dc4f29c4d47764e88d3d277dc6f9.tar.xz bootstrap-ca7498faa0c0dc4f29c4d47764e88d3d277dc6f9.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 4c0e4bdcd..d491fea0e 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -362,6 +362,7 @@ } Tooltip.prototype.destroy = function () { + clearTimeout(this.timeout) this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) } @@ -377,6 +378,7 @@ var data = $this.data('bs.tooltip') var options = typeof option == 'object' && option + if (!data && option == 'destroy') return if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) |