aboutsummaryrefslogtreecommitdiff
path: root/js/carousel.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-18 13:06:47 -0800
committerMark Otto <[email protected]>2013-12-18 13:06:47 -0800
commit5bba8744679ddead8673c003997410c71fc47000 (patch)
tree7cb520f428a788652871240a19a9fcc401ecf9f6 /js/carousel.js
parent6315043b1c11c6391f155e0c7299783a13cfee74 (diff)
parent3f577ab86c4e07493d5d24f5fdd3dba30c199400 (diff)
downloadbootstrap-5bba8744679ddead8673c003997410c71fc47000.tar.xz
bootstrap-5bba8744679ddead8673c003997410c71fc47000.zip
Merge branch 'master' into docs_derp
Diffstat (limited to 'js/carousel.js')
-rw-r--r--js/carousel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/carousel.js b/js/carousel.js
index 26f3832ff..3c2e21b6f 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -39,9 +39,9 @@
}
Carousel.DEFAULTS = {
- interval: 5000
- , pause: 'hover'
- , wrap: true
+ interval: 5000,
+ pause: 'hover',
+ wrap: true
}
Carousel.prototype.cycle = function (e) {