diff options
| author | fat-kun <Jacobthornton@gmail.com> | 2013-03-01 09:24:27 +0400 |
|---|---|---|
| committer | fat-kun <Jacobthornton@gmail.com> | 2013-03-01 09:24:27 +0400 |
| commit | eb24718add4dd36fe92fdbdb79e6ff4ce5919300 (patch) | |
| tree | c85d91c9cb9b0b54f48f6747aa08d7db81eafce0 /docs/assets/js/bootstrap-tooltip.js | |
| parent | 16111a5e454a8af4407f4217b5defb6d7a9bdbd3 (diff) | |
| parent | 6b2a010357e184e670a2f4768e37d4886e8a6597 (diff) | |
Merge pull request #7111 from twitter/2.3.1-wipv2.3.1
2.3.1 wip
Diffstat (limited to 'docs/assets/js/bootstrap-tooltip.js')
| -rw-r--r-- | docs/assets/js/bootstrap-tooltip.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 981319077e..835abbe68c 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.3.0 + * bootstrap-tooltip.js v2.3.1 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -80,7 +80,15 @@ } , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + var defaults = $.fn[this.type].defaults + , options = {} + , self + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }, this) + + self = $(e.currentTarget)[this.type](options).data(this.type) if (!self.options.delay || !self.options.delay.show) return self.show() |