don't autoexpand images in fetched quotes

This commit is contained in:
ccd0 2014-09-07 20:42:38 -07:00
parent 95ed236f84
commit ad2619b1bc

View File

@ -29,7 +29,7 @@ ImageExpand =
else if @file.isExpanded and @file.isVideo else if @file.isExpanded and @file.isVideo
ImageExpand.setupVideoCB @ ImageExpand.setupVideoCB @
ImageExpand.setupVideo @, !@origin.file.fullImage?.paused or @origin.file.wasPlaying, @file.fullImage.controls ImageExpand.setupVideo @, !@origin.file.fullImage?.paused or @origin.file.wasPlaying, @file.fullImage.controls
else if ImageExpand.on and !@isHidden and else if ImageExpand.on and !@isHidden and !@isFetchedQuote 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)
ImageExpand.expand @ ImageExpand.expand @
@ -216,14 +216,11 @@ ImageExpand =
fullImage.controls = controls fullImage.controls = controls
return return
fullImage.controls = false fullImage.controls = false
if post.isFetchedQuote $.asap (=> doc.contains fullImage), =>
post.file.wasPlaying = true if !d.hidden and Header.isNodeVisible fullImage
else fullImage.play()
$.asap (=> doc.contains fullImage), => else
if !d.hidden and Header.isNodeVisible fullImage post.file.wasPlaying = true
fullImage.play()
else
post.file.wasPlaying = true
if controls if controls
ImageCommon.addControls fullImage ImageCommon.addControls fullImage