diff options
| author | Jacob Thornton <[email protected]> | 2012-07-22 14:52:13 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-07-22 14:52:13 -0700 |
| commit | fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c (patch) | |
| tree | 75ae5bf530b047f6a879105da74068fa3843229f /js/bootstrap-tooltip.js | |
| parent | fae6c36874b102408b53c6e5d980b247a9779dea (diff) | |
| parent | 48fc0ad56953f260b0f926f0fd7564e75cd9e9f9 (diff) | |
| download | bootstrap-fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c.tar.xz bootstrap-fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'js/bootstrap-tooltip.js')
| -rw-r--r-- | js/bootstrap-tooltip.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index f280e3696..f9447410e 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -47,8 +47,8 @@ if (this.options.trigger != 'manual') { eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) } this.options.selector ? @@ -176,6 +176,8 @@ $.support.transition && this.$tip.hasClass('fade') ? removeWithAnimation() : $tip.remove() + + return this } , fixTitle: function () { @@ -236,7 +238,7 @@ } , destroy: function () { - this.$element.off().removeData('tooltip') + this.hide().$element.off('.' + this.type).removeData(this.type) } } |