aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-02-28 20:39:07 -0800
committerfat <[email protected]>2013-02-28 20:39:07 -0800
commit01e0f8c653db442326ee1559eac4691af246d49e (patch)
tree78dee7bc15426892f05d607769761567f9d67d6e /js
parentcf998040eca7154e8a55f0a8db8acab301acac7c (diff)
downloadbootstrap-01e0f8c653db442326ee1559eac4691af246d49e.tar.xz
bootstrap-01e0f8c653db442326ee1559eac4691af246d49e.zip
only pass unique options through to child nodes in tooltips
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-tooltip.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 981319077..539b16071 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -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()