From 01e0f8c653db442326ee1559eac4691af246d49e Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 28 Feb 2013 20:39:07 -0800 Subject: only pass unique options through to child nodes in tooltips --- docs/assets/js/bootstrap-tooltip.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docs/assets/js/bootstrap-tooltip.js') diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 981319077..a15b81e16 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -80,7 +80,16 @@ } , 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() -- cgit v1.2.3 From 2f27d9851c72a28fc4591daf87fab8f05e0fb01f Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 28 Feb 2013 20:48:02 -0800 Subject: whitespace --- docs/assets/js/bootstrap-tooltip.js | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/js/bootstrap-tooltip.js') diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index a15b81e16..539b16071 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -84,7 +84,6 @@ , options = {} , self - this._options && $.each(this._options, function (key, value) { if (defaults[key] != value) options[key] = value }, this) -- cgit v1.2.3 From 3469339068a5676b225af7a39dffcad41e391934 Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 28 Feb 2013 20:55:14 -0800 Subject: 2.3.1 --- docs/assets/js/bootstrap-tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/js/bootstrap-tooltip.js') diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 539b16071..835abbe68 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 * =========================================================== -- cgit v1.2.3