diff options
| author | fat-kun <Jacobthornton@gmail.com> | 2013-02-06 09:48:34 +0400 |
|---|---|---|
| committer | fat-kun <Jacobthornton@gmail.com> | 2013-02-06 09:48:34 +0400 |
| commit | 6a9cd513c02a6c156769d54910f1d3931da3e568 (patch) | |
| tree | 32dd1a1add8fa58e1e89f8d36255a26be6a4f927 /js/bootstrap-popover.js | |
| parent | 042bb9b51510573a9a1db6bc66cb16311d0d580b (diff) | |
| parent | 4b86a91e5339600e14e37d3309f2a4bb645cebc5 (diff) | |
Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
Diffstat (limited to 'js/bootstrap-popover.js')
| -rw-r--r-- | js/bootstrap-popover.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index ca0b5eb6b9..0e7774bf66 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -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);
\ No newline at end of file +}(window.jQuery); |