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

fix playing in clones

Browse Source
This commit is contained in:
ccd0 2014-07-27 13:26:29 -07:00
parent 86d37f6aef
commit 2360185eb4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Images/ImageCommon.coffee
View File

@ -44,6 +44,7 @@ ImageCommon =
return cb URL return cb URL
cb null # report nothing to retry cb null # report nothing to retry
# Add controls, but not until the mouse is moved over the video.
addControls: (video) -> addControls: (video) ->
handler = -> handler = ->
$.off video, 'mouseover', handler $.off video, 'mouseover', handler

4
src/Images/ImageExpand.coffee
View File

@ -26,7 +26,8 @@ ImageExpand =
ImageExpand.expand @ ImageExpand.expand @
else if @file.isExpanded and @file.isVideo else if @file.isExpanded and @file.isVideo
ImageExpand.setupVideoCB @ ImageExpand.setupVideoCB @
ImageExpand.play @ if !@origin.file.fullImage?.paused or @origin.file.wasPlaying if !@origin.file.fullImage?.paused or @origin.file.wasPlaying
$.asap (=> doc.contains @nodes.root), => ImageExpand.play @
else if ImageExpand.on and !@isHidden and else if ImageExpand.on and !@isHidden and
(Conf['Expand spoilers'] or !@file.isSpoiler) and (Conf['Expand spoilers'] or !@file.isSpoiler) and
(Conf['Expand videos'] or !@file.isVideo) (Conf['Expand videos'] or !@file.isVideo)
@ -206,6 +207,7 @@ ImageExpand =
ImageCommon.addControls file.fullImage if Conf['Show Controls'] ImageCommon.addControls file.fullImage if Conf['Show Controls']
play: (post) -> play: (post) ->
c.log 'play', !d.hidden and Header.isNodeVisible post.file.fullImage
if !d.hidden and Header.isNodeVisible post.file.fullImage if !d.hidden and Header.isNodeVisible post.file.fullImage
post.file.fullImage.play() post.file.fullImage.play()
else else