aboutsummaryrefslogtreecommitdiff
path: root/js/bootstrap-tooltip.js
diff options
context:
space:
mode:
authorbilly gates <[email protected]>2012-10-17 21:34:01 -0700
committerbilly gates <[email protected]>2012-10-17 21:34:01 -0700
commit0a3e034891255f31f37adb69c2f01fd5f6d259d1 (patch)
tree86daaff803bc17252cb76e7caadb0f9bc8b7eb6c /js/bootstrap-tooltip.js
parent97bf02d78791c08a7d459d532ca3ce9ec8d457a1 (diff)
parent6b017b9bea37629d0ee9bcd99e8e34b91aa3b5c0 (diff)
downloadbootstrap-0a3e034891255f31f37adb69c2f01fd5f6d259d1.tar.xz
bootstrap-0a3e034891255f31f37adb69c2f01fd5f6d259d1.zip
Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
Fix tooltip not working in delegate events on click-trigger
Diffstat (limited to 'js/bootstrap-tooltip.js')
-rw-r--r--js/bootstrap-tooltip.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 14e48c856..d5c2def29 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -235,8 +235,9 @@
this.enabled = !this.enabled
}
- , toggle: function () {
- this[this.tip().hasClass('in') ? 'hide' : 'show']()
+ , toggle: function (e) {
+ var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ self[self.tip().hasClass('in') ? 'hide' : 'show']()
}
, destroy: function () {