diff options
| author | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-10-17 21:38:01 -0700 |
| commit | 8e6697f2b20da705377d2a7a2eb6957a4df59d77 (patch) | |
| tree | a74876b2006677d83418b8e967145f2249455d7b /js/bootstrap-tooltip.js | |
| parent | ac6625de5fb01067e6f64996c84e93ade654d7d5 (diff) | |
| parent | 0a3e034891255f31f37adb69c2f01fd5f6d259d1 (diff) | |
| download | bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.tar.xz bootstrap-8e6697f2b20da705377d2a7a2eb6957a4df59d77.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'js/bootstrap-tooltip.js')
| -rw-r--r-- | js/bootstrap-tooltip.js | 5 |
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 () { |