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 | |
| parent | e05d39d4ccaadb750d251a268adbeef681472029 (diff) | |
| download | bootstrap-a00b849a51077ea52feefc3e39d67f05a3c669a9.tar.xz bootstrap-a00b849a51077ea52feefc3e39d67f05a3c669a9.zip | |
rebuild and change data-attr to have priority over options
| -rw-r--r-- | bootstrap-1.1.1.css | 2 | ||||
| -rw-r--r-- | examples/assets/js/bootstrap-popover.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 92e141119..093a39476 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 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]) } |