mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 13:29:06 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joseph Price
2013-02-02 18:55:18 -05:00
parent dbe8aed76e
commit 1fe4ed8823
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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