Merge branch 'mayhem' into v3

Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee

CHANGELOG.md

@@ -1,4 +1,5 @@
 **MayhemYDG**:
+- Fix captcha not refreshing.
 - Thread and post hiding changes:
  - The posts' menu now has a label entry listing the reasons why a post got hidden or highlighted.
  - `Thread Hiding` and `Reply Hiding` settings are merged into one: `Post Hiding`.

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.4.1 - 2014-03-26
+* 4chan X - Version 1.4.1 - 2014-03-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE

builds/4chan-X.user.js

@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.4.1 - 2014-03-26
+* 4chan X - Version 1.4.1 - 2014-03-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -6906,7 +6906,9 @@
       $.sync('captchas', QR.captcha.sync);
       QR.captcha.nodes.challenge = challenge;
       new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
-        childList: true
+        childList: true,
+        subtree: true,
+        attributes: true
       });
       return QR.captcha.load();
     },
@@ -9311,7 +9313,7 @@
     })(),
     toggle: function(e) {
       var fullID;
-      fullID = $.x('ancestor::*[@data-full-i-d]', this).dataset.fullID;
+      fullID = $.x('ancestor::*[@data-full-i-d][1]', this).dataset.fullID;
       return Menu.menu.toggle(e, this, g.posts[fullID]);
     }
   };

builds/crx/script.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* 4chan X - Version 1.4.1 - 2014-03-26
+* 4chan X - Version 1.4.1 - 2014-03-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -6951,7 +6951,9 @@
       $.sync('captchas', QR.captcha.sync);
       QR.captcha.nodes.challenge = challenge;
       new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
-        childList: true
+        childList: true,
+        subtree: true,
+        attributes: true
       });
       return QR.captcha.load();
     },
@@ -9328,7 +9330,7 @@
     })(),
     toggle: function(e) {
       var fullID;
-      fullID = $.x('ancestor::*[@data-full-i-d]', this).dataset.fullID;
+      fullID = $.x('ancestor::*[@data-full-i-d][1]', this).dataset.fullID;
       return Menu.menu.toggle(e, this, g.posts[fullID]);
     }
   };

json/archives.json

@@ -27,13 +27,22 @@
   "files": ["c", "po"]
 }, {
   "uid": 3,
-  "name": "4plebs",
+  "name": "4plebs Archive",
   "domain": "archive.4plebs.org",
   "http": true,
   "https": true,
   "software": "foolfuuka",
-  "boards": ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"],
-  "files": ["adv", "hr", "o", "pol", "s4s", "tg", "tv", "x"]
+  "boards": ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"],
+  "files": ["adv", "hr", "o", "pol", "s4s", "tg", "trv", "tv", "x"]
+}, {
+  "uid": 18,
+  "name": "4plebs Flash Archive",
+  "domain": "flash.4plebs.org",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["f"],
+  "files": ["f"]
 }, {
   "uid": 4,
   "name": "Nyafuu",

src/General/Header.coffee

@@ -1,6 +1,5 @@
 Header =
   init: ->
-
     @menu = new UI.Menu 'header'
 
     menuButton = $.el 'span',

src/Menu/Menu.coffee

@@ -35,5 +35,5 @@ Menu =
       button
 
   toggle: (e) ->
-    fullID = $.x('ancestor::*[@data-full-i-d]', @).dataset.fullID
+    fullID = $.x('ancestor::*[@data-full-i-d][1]', @).dataset.fullID
     Menu.menu.toggle e, @, g.posts[fullID]

src/Posting/QR.captcha.coffee

@@ -60,6 +60,8 @@ QR.captcha =
     QR.captcha.nodes.challenge = challenge
     new MutationObserver(QR.captcha.load.bind QR.captcha).observe challenge,
       childList: true
+      subtree: true
+      attributes: true
     QR.captcha.load()
 
   sync: (captchas) ->