From: Joseph Price <joseph.price@huffingtonpost.com>
Date: Sat, 2 Feb 2013 23:55:18 +0000 (-0500)
Subject: reordered access of options in tooltip and popover to allow overriding data attrs... 
X-Git-Tag: v2.3.0^2~5^2~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fe4ed882341af29a3b709c06642e0dbb556560f;p=thirdparty%2Fbootstrap.git

reordered access of options in tooltip and popover to allow overriding data attrs from js
---

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 624eb5e31a..7f65110803 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -58,8 +58,8 @@
         , $e = this.$element
         , o = this.options
 
-      content = $e.attr('data-content')
-        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content) ||
+        || $e.attr('data-content')
 
       return content
     }
@@ -111,4 +111,4 @@
     return this
   }
 
-}(window.jQuery);
\ No newline at end of file
+}(window.jQuery);
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index c23d8267a8..dc06762dd0 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -67,7 +67,7 @@
     }
 
   , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
 
       if (options.delay && typeof options.delay == 'number') {
         options.delay = {