diff options
| author | Mark Otto <[email protected]> | 2012-01-14 16:18:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-14 16:18:39 -0800 |
| commit | 7455dd6b4564680ff7f80d8014ef7b973cd5755d (patch) | |
| tree | 901b90f10b4f5321d633f9170a14704cd7c0c99d /js | |
| parent | f587e81b7d72e47b16bf808c721c3dfe45ae1062 (diff) | |
| parent | 59673bf9f7ea2749a6422b0805914e973b92f9ec (diff) | |
| download | bootstrap-7455dd6b4564680ff7f80d8014ef7b973cd5755d.tar.xz bootstrap-7455dd6b4564680ff7f80d8014ef7b973cd5755d.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'js')
| -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 ) |