From 0fe9148b91eff50b83100b6795fb49cf894caed1 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 5 Feb 2013 22:17:28 -0800
Subject: Fixes #6190: Add print utility classes

---
 docs/assets/js/bootstrap.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'docs/assets/js/bootstrap.js')

diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
index 0fb4c410a..93c7215ba 100644
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -1109,7 +1109,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 = {
@@ -1406,8 +1406,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
     }
@@ -1459,7 +1459,8 @@
     return this
   }
 
-}(window.jQuery);/* =============================================================
+}(window.jQuery);
+/* =============================================================
  * bootstrap-scrollspy.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
-- 
cgit v1.2.3