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

clicking the image stops the slideshow

Browse Source
This commit is contained in:
ccd0 2014-07-05 17:40:42 -07:00
parent 045260362d
commit ac9b152a64
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/General/Config.coffee
View File

@ -444,7 +444,7 @@ Config =
'Advance to next post when contracting an expanded image.' 'Advance to next post when contracting an expanded image.'
] ]
gallery : gallery:
'Hide Thumbnails': [ 'Hide Thumbnails': [
false false
] ]

16
src/Images/Gallery.coffee
View File

@ -54,7 +54,7 @@ Gallery =
{cb} = Gallery {cb} = Gallery
$.on nodes.frame, 'click', cb.blank $.on nodes.frame, 'click', cb.blank
$.on nodes.next, 'click', cb.advance $.on nodes.next, 'click', cb.click
$.on $('.gal-prev', dialog), 'click', cb.prev $.on $('.gal-prev', dialog), 'click', cb.prev
$.on $('.gal-next', dialog), 'click', cb.next $.on $('.gal-next', dialog), 'click', cb.next
$.on $('.gal-start', dialog), 'click', cb.start $.on $('.gal-start', dialog), 'click', cb.start
@ -118,7 +118,7 @@ Gallery =
when 'Right' when 'Right'
Gallery.cb.next Gallery.cb.next
when 'Enter' when 'Enter'
Gallery.cb.advanceKey Gallery.cb.advance
when 'Left', '' when 'Left', ''
Gallery.cb.prev Gallery.cb.prev
when 'p' when 'p'
@ -200,15 +200,17 @@ 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()
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 @
advance: -> Gallery.cb.advanceKey() unless Gallery.nodes.current.controls
toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']() toggleSlideshow: -> Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
advanceKey: -> click: ->
if Gallery.nodes.current.paused then return Gallery.nodes.current.play() if Gallery.slideshow
Gallery.cb.next() 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'