diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 92e141119d5817c9f8342726257641c9078ecad4..093a39476ad7778d8d64817af651a4c2105828dc 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Aug 27 18:02:38 PDT 2011 + * Date: Sat Aug 27 18:04:39 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/examples/assets/js/bootstrap-popover.js b/examples/assets/js/bootstrap-popover.js index ca1b8d8f28296e5882ba0c1646591da80324c19b..53284806f9b5200000f7739217f0c2b2665d71c9 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]) }