Merge branch 'Stable' into Beta

Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2014-12-08 10:23:15 -08:00
commit f911079671
2 changed files with 15 additions and 8 deletions

View File

@ -30,6 +30,12 @@ Based on v1.9.14.2.
- Bug fixes.
<!-- v1.9.14.x -->
### v1.9.14.4
*2014-12-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.4/builds/4chan-X-noupdate.crx "Chromium version")]
**ccd0**
- Fix sounds sometimes playing for a short time before `Disable Autoplaying Sounds` halts them.
### v1.9.14.3
*2014-12-07* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.3/builds/4chan-X-noupdate.crx "Chromium version")]

View File

@ -1,12 +1,13 @@
AntiAutoplay =
init: ->
return if !Conf['Disable Autoplaying Sounds']
$.ready @ready
@stop audio for audio in $$ 'audio[autoplay]', doc
window.addEventListener 'loadstart', ((e) => @stop e.target), true
ready: ->
for audio in $$ 'audio[autoplay]'
audio.pause()
audio.autoplay = false
unless audio.controls
audio.controls = true
$.addClass audio, 'controls-added'
stop: (audio) ->
return unless audio.autoplay
audio.pause()
audio.autoplay = false
return if audio.controls
audio.controls = true
$.addClass audio, 'controls-added'