diff options
| author | Jacob Thornton <[email protected]> | 2011-08-27 18:05:10 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-27 18:05:10 -0700 |
| commit | a00b849a51077ea52feefc3e39d67f05a3c669a9 (patch) | |
| tree | 2ed32caac1fa7949a07bf32943c6664a18d14c0b /examples | |
| parent | e05d39d4ccaadb750d251a268adbeef681472029 (diff) | |
| download | bootstrap-a00b849a51077ea52feefc3e39d67f05a3c669a9.tar.xz bootstrap-a00b849a51077ea52feefc3e39d67f05a3c669a9.zip | |
rebuild and change data-attr to have priority over options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/assets/js/bootstrap-popover.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/assets/js/bootstrap-popover.js b/examples/assets/js/bootstrap-popover.js index ca1b8d8f2..53284806f 100644 --- a/examples/assets/js/bootstrap-popover.js +++ b/examples/assets/js/bootstrap-popover.js @@ -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]) } |