Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better: selecting anything but a subsequent image ends the slideshow

Browse Source
This commit is contained in:
ccd0 2014-07-05 18:46:18 -07:00
parent ac9b152a64
commit 3a95789a7e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Images/Gallery.coffee
View File

@ -118,7 +118,7 @@ Gallery =
when 'Right' when 'Right'
Gallery.cb.next Gallery.cb.next
when 'Enter' when 'Enter'
Gallery.cb.advance Gallery.cb.enterKey
when 'Left', '' when 'Left', ''
Gallery.cb.prev Gallery.cb.prev
when 'p' when 'p'
@ -137,6 +137,7 @@ Gallery =
{nodes} = Gallery {nodes} = Gallery
{name} = nodes {name} = nodes
slideshow = Gallery.slideshow and +@dataset.id > +nodes.current.dataset.id
$.rmClass el, 'gal-highlight' if el = $ '.gal-highlight', nodes.thumbs $.rmClass el, 'gal-highlight' if el = $ '.gal-highlight', nodes.thumbs
$.addClass @, 'gal-highlight' $.addClass @, 'gal-highlight'
@ -159,7 +160,7 @@ Gallery =
nodes.current = file nodes.current = file
nodes.frame.scrollTop = 0 nodes.frame.scrollTop = 0
nodes.next.focus() nodes.next.focus()
Gallery.cb.setupTimer() if Gallery.slideshow Gallery.cb[if slideshow then 'setupTimer' else 'stop']()
# Center selected thumbnail # Center selected thumbnail
nodes.thumbs.scrollTop = @offsetTop + @offsetHeight/2 - nodes.thumbs.clientHeight/2 nodes.thumbs.scrollTop = @offsetTop + @offsetHeight/2 - nodes.thumbs.clientHeight/2
@ -200,24 +201,25 @@ Gallery =
prev: -> Gallery.cb.open.call Gallery.images[+Gallery.nodes.current.dataset.id - 1] prev: -> Gallery.cb.open.call Gallery.images[+Gallery.nodes.current.dataset.id - 1]
next: -> Gallery.cb.open.call Gallery.images[+Gallery.nodes.current.dataset.id + 1] next: -> Gallery.cb.open.call Gallery.images[+Gallery.nodes.current.dataset.id + 1]
advance: -> if Gallery.nodes.current.paused then return Gallery.nodes.current.play() else Gallery.cb.next() enterKey: -> if Gallery.nodes.current.paused then Gallery.nodes.current.play() else Gallery.cb.next()
click: -> Gallery.cb[if Gallery.nodes.current.controls then 'stop' else 'enterKey']()
toggle: -> (if Gallery.nodes then Gallery.cb.close else Gallery.build)() toggle: -> (if Gallery.nodes then Gallery.cb.close else Gallery.build)()
blank: (e) -> Gallery.cb.close() if e.target is @ blank: (e) -> Gallery.cb.close() if e.target is @
toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']() toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
click: ->
if Gallery.slideshow
Gallery.cb.stop()
else unless Gallery.nodes.current.controls
Gallery.cb.advance()
pause: -> pause: ->
{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'
setupTimer: -> cleanupTimer: ->
clearTimeout Gallery.timeoutID clearTimeout Gallery.timeoutID
{current} = Gallery.nodes {current} = Gallery.nodes
$.off current, 'canplaythrough load', Gallery.cb.startTimer
$.off current, 'pause', Gallery.cb.next
setupTimer: ->
Gallery.cb.cleanupTimer()
{current} = Gallery.nodes
isVideo = current.nodeName is 'VIDEO' isVideo = current.nodeName is 'VIDEO'
Video.start current if isVideo Video.start current if isVideo
return Gallery.cb.stop() if !Gallery.images[+Gallery.nodes.current.dataset.id + 1] return Gallery.cb.stop() if !Gallery.images[+Gallery.nodes.current.dataset.id + 1]
@ -243,10 +245,9 @@ Gallery =
Gallery.cb.setupTimer() Gallery.cb.setupTimer()
stop: -> stop: ->
clearTimeout Gallery.timeoutID return unless Gallery.slideshow
Gallery.cb.cleanupTimer()
{current} = Gallery.nodes {current} = Gallery.nodes
$.off current, 'canplaythrough load', Gallery.cb.startTimer
$.off current, 'pause', Gallery.cb.next
current.loop = true if current.nodeName is 'VIDEO' current.loop = true if current.nodeName is 'VIDEO'
$.rmClass Gallery.nodes.buttons, 'gal-playing' $.rmClass Gallery.nodes.buttons, 'gal-playing'
Gallery.slideshow = false Gallery.slideshow = false