From bba726218491168ef7ab66735ef1f8893ae9522d Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 17 May 2014 21:35:45 -0700 Subject: [PATCH] support audio check in Chromium --- src/Posting/QR.coffee | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 322af8684..08f7e8d2a 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -402,7 +402,7 @@ QR = img.src = URL.createObjectURL file else if /^video\//.test file.type video = $.el 'video' - $.on video, 'loadedmetadata', -> + $.on video, 'loadeddata', -> return unless cb {videoHeight, videoWidth, duration} = video max_height = Math.min(QR.max_height, QR.max_height_video) @@ -420,11 +420,9 @@ QR = else if duration > QR.max_duration_video QR.error "#{file.name}: Video too long (video: #{duration}s, max: #{QR.max_duration_video}s)" pass = false - <% if (type === 'userscript') { %> - if video.mozHasAudio + if video.mozHasAudio or video.webkitAudioDecodedByteCount QR.error "#{file.name}: Audio not allowed" pass = false - <% } %> cb pass, video cb = null $.on video, 'error', ->