From 01e0f8c653db442326ee1559eac4691af246d49e Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Thu, 28 Feb 2013 20:39:07 -0800
Subject: only pass unique options through to child nodes in tooltips

---
 js/bootstrap-tooltip.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'js/bootstrap-tooltip.js')

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()
 
-- 
cgit v1.2.3


From 3469339068a5676b225af7a39dffcad41e391934 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Thu, 28 Feb 2013 20:55:14 -0800
Subject: 2.3.1

---
 js/bootstrap-tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/bootstrap-tooltip.js')

diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 539b16071..835abbe68 100644
--- a/js/bootstrap-tooltip.js
+++ b/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