mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 19:06:40 +02:00
Code Issues Releases Wiki Activity

rebuild and change data-attr to have priority over options

Browse Source
This commit is contained in:
Jacob Thornton
2011-08-27 18:05:10 -07:00
parent e05d39d4cc
commit a00b849a51
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/assets/js/bootstrap-popover.js vendored
View File

@@ -26,7 +26,7 @@
, getTitle: function () {
var title
if (typeof this.options.title == 'string') {
title = this.options.title || this.$element.attr('data-title')
title = this.$element.attr('data-title') || this.options.title
} else if (typeof this.options.title == 'function') {
title = this.options.title.call(this.$element[0])
}
@@ -36,7 +36,7 @@
, getContent: function () {content
var content
if (typeof this.options.content == 'string') {
content = this.options.content || this.$element.attr('data-content')
content = this.$element.attr('data-content') || this.options.content
} else if (typeof this.options.content == 'function') {
content = this.options.content.call(this.$element[0])
}