From 43454eae88e0236d16684083e26c6a13ae3242f8 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 30 Jan 2015 21:56:42 -0800 Subject: [PATCH] WebMs with sound sighted on /wsg/! --- src/General/Config.coffee | 4 ++++ src/Images/Gallery.coffee | 1 + src/Images/ImageExpand.coffee | 1 + src/Images/ImageHover.coffee | 1 + src/Images/ImageLoader.coffee | 1 + 5 files changed, 8 insertions(+) diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 7e83703b4..2c5fa92de 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -244,6 +244,10 @@ Config = true 'Show controls on videos expanded inline.' ] + 'Allow Sound': [ + true + 'Allow sound in videos.' + ] 'Loop in New Tab': [ true 'Loop videos opened in their own tabs.' diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee index f3cef9bf4..7b77df7c8 100644 --- a/src/Images/Gallery.coffee +++ b/src/Images/Gallery.coffee @@ -147,6 +147,7 @@ Gallery = $.replace nodes.current, file if elType is 'video' file.loop = true + file.muted = !Conf['Allow Sound'] file.play() if Conf['Autoplay'] ImageCommon.addControls file if Conf['Show Controls'] nodes.count.textContent = +thumb.dataset.id + 1 diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 653b1c867..4793d97cf 100755 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -172,6 +172,7 @@ ImageExpand = thumb.parentNode.removeAttribute 'target' el.loop = true + el.muted = !Conf['Allow Sound'] if !isVideo $.asap (-> el.naturalHeight), -> ImageExpand.completeExpand post diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index e3415fecd..7be6c5981 100755 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -38,6 +38,7 @@ ImageHover = if isVideo el.loop = true el.controls = false + el.muted = !Conf['Allow Sound'] el.play() if Conf['Autoplay'] [width, height] = file.dimensions.split('x').map (x) -> +x {left, right} = @getBoundingClientRect() diff --git a/src/Images/ImageLoader.coffee b/src/Images/ImageLoader.coffee index 0c73999cf..9c905acfd 100755 --- a/src/Images/ImageLoader.coffee +++ b/src/Images/ImageLoader.coffee @@ -46,6 +46,7 @@ ImageLoader = video = $.el 'video', preload: 'none' loop: true + muted: true poster: thumb.src textContent: thumb.alt className: thumb.className