diff options
| author | Mark Otto <[email protected]> | 2013-02-05 22:17:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 22:17:28 -0800 |
| commit | 0fe9148b91eff50b83100b6795fb49cf894caed1 (patch) | |
| tree | b8de9833bfbe2b50c094011cbf4c37be20eddaee /docs/assets/js/bootstrap.js | |
| parent | 6a9cd513c02a6c156769d54910f1d3931da3e568 (diff) | |
| download | bootstrap-0fe9148b91eff50b83100b6795fb49cf894caed1.tar.xz bootstrap-0fe9148b91eff50b83100b6795fb49cf894caed1.zip | |
Fixes #6190: Add print utility classes
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 0fb4c410a..93c7215ba 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1109,7 +1109,7 @@ } , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) if (options.delay && typeof options.delay == 'number') { options.delay = { @@ -1406,8 +1406,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 } @@ -1459,7 +1459,8 @@ return this } -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-scrollspy.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= |