mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Fixes #6190: Add print utility classes

Browse Source
This commit is contained in:
Mark Otto
2013-02-05 22:17:28 -08:00
parent 6a9cd513c0
commit 0fe9148b91
6 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/assets/js/bootstrap.js vendored
View File

@@ -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
* =============================================================