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

Handle webm playback errors with image expansion.

Browse Source
This commit is contained in:
Mayhem 2014-04-09 10:04:51 +02:00
parent 82f062ffeb
commit 06e6f84867
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
- Better handling of webm playback errors.
### 3.20.3 - *2014-04-07* ### 3.20.3 - *2014-04-07*
- Dramatically decreased CPU usage by pausing webm files not in the viewport. - Dramatically decreased CPU usage by pausing webm files not in the viewport.

23
src/Images/ImageExpand.coffee
View File

@ -17,6 +17,8 @@ ImageExpand =
return unless @file and (@file.isImage or @file.isVideo) return unless @file and (@file.isImage or @file.isVideo)
$.on @file.thumb.parentNode, 'click', ImageExpand.cb.toggle $.on @file.thumb.parentNode, 'click', ImageExpand.cb.toggle
if @isClone if @isClone
if @file.error
@file.error = $ '.warning', @file.thumb.parentNode
if @file.isImage and @file.isExpanding if @file.isImage and @file.isExpanding
# If we clone a post where the image is still loading, # If we clone a post where the image is still loading,
# make it loading in the clone too. # make it loading in the clone too.
@ -83,7 +85,7 @@ ImageExpand =
$.rmClass post.nodes.root, 'expanded-image' $.rmClass post.nodes.root, 'expanded-image'
$.rmClass post.file.thumb, 'expanding' $.rmClass post.file.thumb, 'expanding'
delete post.file.isExpanding delete post.file.isExpanding
post.file.isExpanded = false delete post.file.isExpanded
post.file.fullImage.pause() if post.file.isVideo and post.file.fullImage post.file.fullImage.pause() if post.file.isVideo and post.file.fullImage
expand: (post, src) -> expand: (post, src) ->
@ -102,6 +104,9 @@ ImageExpand =
file.src = src or post.file.URL file.src = src or post.file.URL
$.on file, 'error', ImageExpand.error $.on file, 'error', ImageExpand.error
ImageExpand.waitExpand post ImageExpand.waitExpand post
if post.file.error
$.rm post.file.error
delete post.file.error
$.after post.file.thumb, file $.after post.file.thumb, file
waitExpand: (post) -> waitExpand: (post) ->
@ -151,17 +156,29 @@ ImageExpand =
error: -> error: ->
post = Get.postFromNode @ post = Get.postFromNode @
post.file.isReady = false
$.rm @ $.rm @
delete post.file.isReady
delete post.file.fullImage delete post.file.fullImage
# Images can error: # Images can error:
# - before the image started loading. # - before the image started loading.
# - after the image started loading. # - after the image started loading.
unless post.file.isExpanding or post.file.isExpanded unless post.file.isExpanding or post.file.isExpanded
# Don't try to re-expend if it was already contracted. # Don't try to re-expand if it was already contracted.
return return
ImageExpand.contract post ImageExpand.contract post
if @error and @error.code isnt @error.MEDIA_ERR_NETWORK # video
error = switch @error.code
when 1 then 'MEDIA_ERR_ABORTED'
when 3 then 'MEDIA_ERR_DECODE'
when 4 then 'MEDIA_ERR_SRC_NOT_SUPPORTED'
when 5 then 'MEDIA_ERR_ENCRYPTED'
post.file.error = $.el 'div',
textContent: "Playback error: #{error}"
className: 'warning'
$.after post.file.thumb, post.file.error
return
src = @src.split '/' src = @src.split '/'
if src[2] is 'i.4cdn.org' if src[2] is 'i.4cdn.org'
URL = Redirect.to 'file', URL = Redirect.to 'file',