diff options
| author | Jacob Thornton <[email protected]> | 2012-01-14 10:21:08 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-14 10:21:08 -0800 |
| commit | 07530073dd6fe56558703ff6c65994aacc1d4a25 (patch) | |
| tree | 88b4e7109cf24b125f7a46ce2424efacce3a06fb | |
| parent | fc053ac8b27611e3dc7fae769ce28f154250d50e (diff) | |
| parent | 2cea94e892eabbe5edbca3a51347af57621d672d (diff) | |
| download | bootstrap-07530073dd6fe56558703ff6c65994aacc1d4a25.tar.xz bootstrap-07530073dd6fe56558703ff6c65994aacc1d4a25.zip | |
Merge pull request #995 from renajohn/2.0-wip
Fix bug on tooltips placement when passed as a function
| -rw-r--r-- | js/bootstrap-tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 241a44e24..8ce30ab82 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -115,7 +115,7 @@ } placement = typeof this.options.placement == 'function' ? - thing.call(this, $tip[0], this.$element[0]) : + this.options.placement.call(this, $tip[0], this.$element[0]) : this.options.placement inside = /in/.test(placement) @@ -267,4 +267,4 @@ , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' } -}( window.jQuery )
\ No newline at end of file +}( window.jQuery ) |