Commit 555a3b04 authored by Jacob Thornton's avatar Jacob Thornton

fix carousel when hiding a reshowing - make sure it always triggers transition end #3248

parent 0b827965
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) {
this.$element.trigger($.support.transition.end)
this.cycle()
}
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null this.interval = null
return this return this
......
...@@ -178,6 +178,8 @@ ...@@ -178,6 +178,8 @@
} }
, move: function (e) { , move: function (e) {
if (!this.shown) return
switch(e.keyCode) { switch(e.keyCode) {
case 9: // tab case 9: // tab
case 13: // enter case 13: // enter
...@@ -205,7 +207,7 @@ ...@@ -205,7 +207,7 @@
} }
, keypress: function (e) { , keypress: function (e) {
if (!this.shown || this.suppressKeyPressRepeat) return if (this.suppressKeyPressRepeat) return
this.move(e) this.move(e)
} }
......
...@@ -312,6 +312,10 @@ ...@@ -312,6 +312,10 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) {
this.$element.trigger($.support.transition.end)
this.cycle()
}
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null this.interval = null
return this return this
...@@ -1772,6 +1776,8 @@ ...@@ -1772,6 +1776,8 @@
} }
, move: function (e) { , move: function (e) {
if (!this.shown) return
switch(e.keyCode) { switch(e.keyCode) {
case 9: // tab case 9: // tab
case 13: // enter case 13: // enter
...@@ -1799,7 +1805,7 @@ ...@@ -1799,7 +1805,7 @@
} }
, keypress: function (e) { , keypress: function (e) {
if (!this.shown || this.suppressKeyPressRepeat) return if (this.suppressKeyPressRepeat) return
this.move(e) this.move(e)
} }
......
This diff is collapsed.
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) {
this.$element.trigger($.support.transition.end)
this.cycle()
}
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null this.interval = null
return this return this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment