diff options
| author | Mark Otto <[email protected]> | 2013-05-22 21:51:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-22 21:51:54 -0700 |
| commit | 9868d9403c303dcdab8919bbbd6295c2ef424a31 (patch) | |
| tree | 06ab70a377b927344743afc940f0a4aaec39f791 /js | |
| parent | cdcc3e87688e470598fb8254194a5c86f72dd368 (diff) | |
| parent | e7b4fedee8f0e7590d0b8eff7aaae160bad0e483 (diff) | |
| download | bootstrap-9868d9403c303dcdab8919bbbd6295c2ef424a31.tar.xz bootstrap-9868d9403c303dcdab8919bbbd6295c2ef424a31.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 45f068010..80bdf7266 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -97,7 +97,7 @@ this._options && $.each(this._options, function (key, value) { if (defaults[key] != value) options[key] = value - }, this) + }) var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) |