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

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
This commit is contained in:
Mark Otto
2013-02-05 22:42:54 -08:00
parent 6d21d86007 3b56227553
commit 421f9f67c4
19 changed files with 280 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/assets/js/bootstrap-carousel.js vendored
View File

@@ -39,6 +39,7 @@
cycle: function (e) {
if (!e) this.paused = false
if (this.interval) clearInterval(this.interval);
this.options.interval
&& !this.paused
&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval))