aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-16 20:22:01 -0800
committerJacob Thornton <[email protected]>2012-02-16 20:22:01 -0800
commite730f8adb562ccb885d48fea6f8f075530ef53d8 (patch)
tree0f42bb0df1a1bc40ef9a95f684746af268ed572f
parentf9b578260f8898748a2de10bc0bec74699ec5c10 (diff)
downloadbootstrap-e730f8adb562ccb885d48fea6f8f075530ef53d8.tar.xz
bootstrap-e730f8adb562ccb885d48fea6f8f075530ef53d8.zip
null out interval so that pause doesn't resume on next or prev
-rw-r--r--docs/assets/bootstrap.zipbin53167 -> 53181 bytes
-rw-r--r--docs/assets/js/bootstrap-carousel.js1
-rw-r--r--js/bootstrap-carousel.js1
3 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e433b7305..dacefe63f 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 3c0f1df83..374697994 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -61,6 +61,7 @@
, pause: function () {
clearInterval(this.interval)
+ this.interval = null
return this
}
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 3c0f1df83..374697994 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -61,6 +61,7 @@
, pause: function () {
clearInterval(this.interval)
+ this.interval = null
return this
}