use ended event for end of video detection; stop slideshow on manual pauses
This commit is contained in:
parent
4bf6f9a4fc
commit
45eac0f77f
@ -208,6 +208,7 @@ Gallery =
|
|||||||
toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
|
toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
|
||||||
|
|
||||||
pause: ->
|
pause: ->
|
||||||
|
Gallery.cb.stop()
|
||||||
{current} = Gallery.nodes
|
{current} = Gallery.nodes
|
||||||
current[if current.paused then 'play' else 'pause']() if current.nodeName is 'VIDEO'
|
current[if current.paused then 'play' else 'pause']() if current.nodeName is 'VIDEO'
|
||||||
|
|
||||||
@ -215,7 +216,7 @@ Gallery =
|
|||||||
clearTimeout Gallery.timeoutID
|
clearTimeout Gallery.timeoutID
|
||||||
{current} = Gallery.nodes
|
{current} = Gallery.nodes
|
||||||
$.off current, 'canplaythrough load', Gallery.cb.startTimer
|
$.off current, 'canplaythrough load', Gallery.cb.startTimer
|
||||||
$.off current, 'pause', Gallery.cb.next
|
$.off current, 'ended', Gallery.cb.next
|
||||||
|
|
||||||
setupTimer: ->
|
setupTimer: ->
|
||||||
Gallery.cb.cleanupTimer()
|
Gallery.cb.cleanupTimer()
|
||||||
@ -234,7 +235,7 @@ Gallery =
|
|||||||
checkTimer: ->
|
checkTimer: ->
|
||||||
{current} = Gallery.nodes
|
{current} = Gallery.nodes
|
||||||
if current.nodeName is 'VIDEO' and !current.paused
|
if current.nodeName is 'VIDEO' and !current.paused
|
||||||
$.on current, 'pause', Gallery.cb.next
|
$.on current, 'ended', Gallery.cb.next
|
||||||
current.loop = false
|
current.loop = false
|
||||||
else
|
else
|
||||||
Gallery.cb.next()
|
Gallery.cb.next()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user