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

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

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