Merge branch 'master' into recaptcha2

CHANGELOG.md

@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
 The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
 
 <!-- v1.9.14.x -->
+### 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")]
+
+**ccd0**
+- Add `Disable Autoplaying Sounds` option, off by default (as in v1.9.13.5).
+
 ### v1.9.14.1 
 *2014-12-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.1/builds/4chan-X-noupdate.crx "Chromium version")]
 
@@ -12,12 +18,20 @@ The links to individual versions below are to copies of the script with the upda
 ### v1.9.14.0 
 *2014-11-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.0/builds/4chan-X-noupdate.crx "Chromium version")]
 
+Based on v1.9.13.4.
+
 **ccd0**
 - `Quote Threading` is now compatible with the `Unread Line` and `Scroll to Last Read Post` features.
 - When there are unread replies to a read post, which are not threaded so you don't miss them, a `[Thread New Posts]` link appears at the bottom of the page, which will thread them when clicked.
 - Fix some scrolling bugs when images are contracted.
 
 <!-- v1.9.13.x -->
+### v1.9.13.5 
+*2014-12-04* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.13.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.13.5/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Add `Disable Autoplaying Sounds` option (off by default).
+
 ### v1.9.13.4 
 *2014-11-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.13.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.13.4/builds/4chan-X-noupdate.crx "Chromium version")]
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.14.1
+* 4chan X - Version 1.9.14.2
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE

builds/4chan-X-beta.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.9.14.1
+// @version      1.9.14.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.14.1
+// @version      1.9.14.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/updates-beta.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.14.1' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.14.2' />
   </app>
 </gupdate>
 

builds/updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.14.1' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.14.2' />
   </app>
 </gupdate>
 

package.json

@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.9.14.1",
+    "version": "1.9.14.2",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",

src/General/Config.coffee

@@ -101,6 +101,10 @@ Config =
         true
         'Rewrite the URL of the current page, removing stubs and changing /res/ to /thread/.'
       ]
+      'Disable Autoplaying Sounds': [
+        false
+        'Prevent sounds on the page from autoplaying.'
+      ]
 
     'Linkification':
       'Linkify': [

src/General/Main.coffee

@@ -286,6 +286,7 @@ Main =
     ['Catalog Links',             CatalogLinks]
     ['Settings',                  Settings]
     ['Index Generator',           Index]
+    ['Disable Autoplay',          AntiAutoplay]
     ['Announcement Hiding',       PSAHiding]
     ['Fourchan thingies',         Fourchan]
     ['Color User IDs',            IDColor]

src/General/css/style.css

@@ -97,10 +97,14 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
   unicode-bidi: -moz-isolate;
   unicode-bidi: -webkit-isolate;
 }
-/* party hats */
 .thread > img:first-child {
+  /* party hats */
   pointer-events: none;
 }
+.center > audio {
+  display: block;
+  margin: auto;
+}
 
 /* fixed, z-index */
 #overlay,

src/Miscellaneous/AntiAutoplay.coffee

@@ -0,0 +1,10 @@
+AntiAutoplay =
+  init: ->
+    return if !Conf['Disable Autoplaying Sounds']
+    $.ready @ready
+
+  ready: ->
+    for audio in $$ 'audio[autoplay]'
+      audio.pause()
+      audio.autoplay = false
+      audio.controls = true