Merge pull request twbs#6783 from joprice/popoverOptionsOverride

fat · fat · commit 6a9cd513c02a · 2013-02-05T21:48:34.000-08:00
reordered access of options in tooltip and popover
diff --git 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);
+}(window.jQuery);
diff --git 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 = {

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@`
`58`	`58`	`, $e = this.$element`
`59`	`59`	`, o = this.options`
`60`	`60`
`61`		`- content = $e.attr('data-content')`
`62`		`- \|\| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)`
	`61`	`+ content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)`
	`62`	`+ \|\| $e.attr('data-content')`
`63`	`63`
`64`	`64`	`return content`
`65`	`65`	`}`
`@@ -111,4 +111,4 @@`
`111`	`111`	`return this`
`112`	`112`	`}`
`113`	`113`
`114`		`-}(window.jQuery);`
	`114`	`+}(window.jQuery);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`, getOptions: function (options) {`
`70`		`- options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())`
	`70`	`+ options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)`
`71`	`71`
`72`	`72`	`if (options.delay && typeof options.delay == 'number') {`
`73`	`73`	`options.delay = {`