Commit 07530073 authored by Jacob Thornton's avatar Jacob Thornton

Merge pull request #995 from renajohn/2.0-wip

Fix bug on tooltips placement when passed as a function
parents fc053ac8 2cea94e8
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
} }
placement = typeof this.options.placement == 'function' ? 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 this.options.placement
inside = /in/.test(placement) inside = /in/.test(placement)
...@@ -267,4 +267,4 @@ ...@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
} }
}( window.jQuery ) }( window.jQuery )
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment