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

CHANGELOG.md

@@ -30,6 +30,13 @@ Based on v1.9.15.19.
 - Add option `Force Noscript Captcha` to use the non-Javascript version of Recaptcha and an interface similar to the old Recaptcha. Also use this version of the captcha if Javascript is disabled on the page (4chan X can be used this way in Greasemonkey 2.x).
 
 <!-- v1.9.15.x -->
+### v1.9.15.21 
+*2014-12-15* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.21/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.21/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Flags on /pol/ are now country flags.
+- Update `Disable Autoplaying Sounds` to stop Youtube videos and `<marquee>`.
+
 ### v1.9.15.20 
 *2014-12-14* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.20/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.20/builds/4chan-X-noupdate.crx "Chromium version")]
 

src/General/Build.coffee

@@ -127,7 +127,7 @@ Build =
 
     flag = unless flagCode
       <%= html('') %>
-    else if boardID is 'pol'
+    else if false
       <%= html('<img src="//s.4cdn.org/image/country/troll/${flagCode.toLowerCase()}.gif" alt="${flagCode}" title="${flagName}" class="countryFlag">') %>
     else
       <%= html('<span title="${flagName}" class="flag flag-${flagCode.toLowerCase()}"></span>') %>

src/General/Config.coffee

@@ -103,7 +103,7 @@ Config =
       ]
       'Disable Autoplaying Sounds': [
         false
-        'Prevent sounds on the page from autoplaying.'
+        'Stop autoplaying sounds and other annoyances.'
       ]
 
     'Linkification':

src/General/css/style.css

@@ -109,6 +109,15 @@ audio.controls-added {
   display: block;
   margin: auto;
 }
+:root.anti-autoplay div.embed {
+  position: static;
+  width: auto;
+  height: auto;
+  text-align: center;
+}
+:root.anti-autoplay marquee {
+  visibility: hidden;
+}
 
 /* fixed, z-index */
 #overlay,

src/Miscellaneous/AntiAutoplay.coffee

@@ -1,8 +1,16 @@
 AntiAutoplay =
   init: ->
     return if !Conf['Disable Autoplaying Sounds']
+    $.addClass doc, 'anti-autoplay'
     @stop audio for audio in $$ 'audio[autoplay]', doc
     window.addEventListener 'loadstart', ((e) => @stop e.target), true
+    Post.callbacks.push
+      name: 'Disable Autoplaying Sounds'
+      cb:   @node
+    CatalogThread.callbacks.push
+      name: 'Disable Autoplaying Sounds'
+      cb:   @node
+    $.ready => @process d.body
 
   stop: (audio) ->
     return unless audio.autoplay
@@ -11,3 +19,14 @@ AntiAutoplay =
     return if audio.controls
     audio.controls = true
     $.addClass audio, 'controls-added'
+
+  node: ->
+    AntiAutoplay.process @nodes.root
+
+  process: (root) ->
+    for iframe in $$ 'iframe[src*="youtube"][src*="autoplay=1"]', root
+      iframe.src = iframe.src.replace(/\?autoplay=1&?/, '?').replace('&autoplay=1', '')
+    for marquee in $$ 'marquee', root
+      span = $.el 'span', className: 'removed-marquee'
+      $.replace marquee, span
+      $.add span, [marquee.childNodes...]

src/Posting/QR.coffee

@@ -607,7 +607,7 @@ QR =
       $.rm nodes.flag
       delete nodes.flag
 
-    if g.BOARD.ID is 'pol'
+    if false
       flag = QR.flags()
       flag.dataset.name    = 'flag'
       flag.dataset.default = '0'