diff options
| author | Jacob Thornton <[email protected]> | 2012-04-14 17:49:51 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-14 17:49:51 -0700 |
| commit | 82267d48ffb522ed4c9cb491660f7d1c8a9e0236 (patch) | |
| tree | 1382e951003bc8ec89d67b4cedd628a2faf7e0e2 | |
| parent | 34132f0e890cacc8eb2dc0cf2ce3132986f14adf (diff) | |
| download | bootstrap-82267d48ffb522ed4c9cb491660f7d1c8a9e0236.tar.xz bootstrap-82267d48ffb522ed4c9cb491660f7d1c8a9e0236.zip | |
calling pause on a slide should actually pause it - even when hovering
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 71274 -> 71315 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-carousel.js | 7 | ||||
| -rw-r--r-- | js/.jshintrc | 11 | ||||
| -rw-r--r-- | js/bootstrap-carousel.js | 7 |
4 files changed, 16 insertions, 9 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 267b9eab6..6e1a6f41c 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index d1c3079e4..90f43a3eb 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 e93a8deee..bbac349e8 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,9 +1,10 @@ { - "browser" : true, - "expr" : true, + "validthis": true, + "laxcomma" : true, "laxbreak" : true, + "browser" : true, + "debug" : true, "boss" : true, - "asi" : true, - "laxcomma" : true, - "validthis": true + "expr" : true, + "asi" : true }
\ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index d1c3079e4..90f43a3eb 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 |