kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge pull request #6783 from joprice/popoverOptionsOverride 

reordered access of options in tooltip and popover
This commit is contained in:
fat-kun 2013-02-05 21:48:34 -08:00
parent 042bb9b515 4b86a91e53
commit 6a9cd513c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/bootstrap-popover.js vendored
View File

@ -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);

2
js/bootstrap-tooltip.js vendored
View File

@ -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 = {