From b588ca43fda85f2b81fe2eeb0501d94252036125 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Mon, 15 Jul 2019 13:17:19 -0700 Subject: [PATCH] Multifile support in ImageCommon.decodeError. #2171 --- src/Images/ImageCommon.coffee | 6 +++--- src/Images/ImageExpand.coffee | 2 +- src/Images/ImageHover.coffee | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Images/ImageCommon.coffee b/src/Images/ImageCommon.coffee index eed544558..5f1f05810 100644 --- a/src/Images/ImageCommon.coffee +++ b/src/Images/ImageCommon.coffee @@ -25,11 +25,11 @@ ImageCommon = cacheError: -> delete ImageCommon.cache if ImageCommon.cache is @ - decodeError: (file, post) -> + decodeError: (file, fileObj) -> return false unless file.error?.code is MediaError.MEDIA_ERR_DECODE - if not (message = $ '.warning', post.file.thumb.parentNode) + if not (message = $ '.warning', fileObj.thumb.parentNode) message = $.el 'div', className: 'warning' - $.after post.file.thumb, message + $.after fileObj.thumb, message message.textContent = 'Error: Corrupt or unplayable video' return true diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 717a527f0..93e23963a 100644 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -267,7 +267,7 @@ ImageExpand = # - after the image started loading. # Don't try to re-expand if it was already contracted. return unless post.file.isExpanding or post.file.isExpanded - if ImageCommon.decodeError @, post + if ImageCommon.decodeError @, post.file return ImageExpand.contract post # Don't autoretry images from the archive. if ImageCommon.isFromArchive @ diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index 23e886c22..cf6ddf0ce 100644 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -23,7 +23,7 @@ ImageHover = return unless doc.contains @ {isVideo} = file return if file.isExpanding or file.isExpanded or g.SITE.isThumbExpanded?(file) - error = ImageHover.error post + error = ImageHover.error post, file if ImageCommon.cache?.dataset.fullID is post.fullID el = ImageCommon.popCache() $.on el, 'error', error @@ -69,8 +69,8 @@ ImageHover = $.rm el el.removeAttribute 'style' - error: (post) -> -> - return if ImageCommon.decodeError @, post + error: (post, file) -> -> + return if ImageCommon.decodeError @, file ImageCommon.error @, post, 3 * $.SECOND, (URL) => if URL @src = URL + if @src is URL then '?' + Date.now() else ''