From a00b849a51077ea52feefc3e39d67f05a3c669a9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 18:05:10 -0700 Subject: rebuild and change data-attr to have priority over options --- examples/assets/js/bootstrap-popover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') 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]) } -- cgit v1.2.3