mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

calling pause on a slide should actually pause it - even when hovering

Browse Source
This commit is contained in:
Jacob Thornton
2012-04-14 17:49:51 -07:00
parent 34132f0e89
commit 82267d48ff
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/bootstrap.zip
BIN
View File
Binary file not shown.
docs/assets/js/bootstrap-carousel.js
Vendored
+5 -2
View File
@@ -37,8 +37,10 @@
Carousel.prototype = { Carousel.prototype = {
cycle: function () { cycle: function (e) {
if (!e) this.paused = false
this.options.interval this.options.interval
&& !this.paused
&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
return this return this
} }
@@ -64,7 +66,8 @@
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
} }
, pause: function () { , pause: function (e) {
if (!e) this.paused = true
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null this.interval = null
return this return this
js/.jshintrc
+7 -6
View File
@@ -1,9 +1,10 @@
{ {
"browser" : true, "validthis": true,
"expr" : true,
"laxbreak" : true,
"boss" : true,
"asi" : true,
"laxcomma" : true, "laxcomma" : true,
"validthis": true "laxbreak" : true,
"browser" : true,
"debug" : true,
"boss" : true,
"expr" : true,
"asi" : true
} }
js/bootstrap-carousel.js
Vendored
+5 -2
View File
@@ -37,8 +37,10 @@
Carousel.prototype = { Carousel.prototype = {
cycle: function () { cycle: function (e) {
if (!e) this.paused = false
this.options.interval this.options.interval
&& !this.paused
&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
return this return this
} }
@@ -64,7 +66,8 @@
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
} }
, pause: function () { , pause: function (e) {
if (!e) this.paused = true
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null this.interval = null
return this return this