diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 267b9eab65..6e1a6f41c1 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index d1c3079e44..90f43a3ebb 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -37,8 +37,10 @@ Carousel.prototype = { - cycle: function () { + cycle: function (e) { + if (!e) this.paused = false this.options.interval + && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } @@ -64,7 +66,8 @@ return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) } - , pause: function () { + , pause: function (e) { + if (!e) this.paused = true clearInterval(this.interval) this.interval = null return this diff --git a/js/.jshintrc b/js/.jshintrc index e93a8deeed..bbac349e8f 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,9 +1,10 @@ { - "browser" : true, - "expr" : true, - "laxbreak" : true, - "boss" : true, - "asi" : true, + "validthis": true, "laxcomma" : true, - "validthis": true + "laxbreak" : true, + "browser" : true, + "debug" : true, + "boss" : true, + "expr" : true, + "asi" : true } \ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index d1c3079e44..90f43a3ebb 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -37,8 +37,10 @@ Carousel.prototype = { - cycle: function () { + cycle: function (e) { + if (!e) this.paused = false this.options.interval + && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } @@ -64,7 +66,8 @@ return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) } - , pause: function () { + , pause: function (e) { + if (!e) this.paused = true clearInterval(this.interval) this.interval = null return this