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-07 16:53:00 -08:00
commit 9959524c47
3 changed files with 12 additions and 2 deletions

View File

@ -16,6 +16,12 @@ Based on v1.9.14.2.
- Bug fixes. - Bug fixes.
<!-- v1.9.14.x --> <!-- v1.9.14.x -->
### 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")]
**ccd0**
- Center the controls added to formerly autoplaying audio by `Disable Autoplaying Sounds`.
### v1.9.14.2 ### v1.9.14.2
*2014-12-04* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.2/builds/4chan-X-noupdate.crx "Chromium version")] *2014-12-04* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.2/builds/4chan-X-noupdate.crx "Chromium version")]

View File

@ -103,7 +103,9 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
/* party hats */ /* party hats */
pointer-events: none; pointer-events: none;
} }
.center > audio {
/* Anti-autoplay */
audio.controls-added {
display: block; display: block;
margin: auto; margin: auto;
} }

View File

@ -7,4 +7,6 @@ AntiAutoplay =
for audio in $$ 'audio[autoplay]' for audio in $$ 'audio[autoplay]'
audio.pause() audio.pause()
audio.autoplay = false audio.autoplay = false
audio.controls = true unless audio.controls
audio.controls = true
$.addClass audio, 'controls-added'