diff options
| author | Mark Otto <[email protected]> | 2013-05-16 18:46:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 18:46:19 -0700 |
| commit | bdd50228331128668be6e9cd68e1f6794b620243 (patch) | |
| tree | ed94717ce410020a0389b20b2b49c363ab4fad1a /js/tooltip.js | |
| parent | c73588b3132b8c848f10561ad8f946f8c58a636b (diff) | |
| parent | 5ab72f76878a85f105702a24096268fea73fba2d (diff) | |
| download | bootstrap-bdd50228331128668be6e9cd68e1f6794b620243.tar.xz bootstrap-bdd50228331128668be6e9cd68e1f6794b620243.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/tooltip.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 a40d242fc..aa535d196 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -92,7 +92,7 @@ } Tooltip.prototype.enter = function (e) { - var defaults = $.fn[this.type].defaults + var defaults = this.getDefaults() var options = {} this._options && $.each(this._options, function (key, value) { |