Merge branch 'bstable'

CHANGELOG.md

@@ -25,6 +25,9 @@
 
 ### v1.13.5
 
+**v1.13.5.3** *(2017-02-02)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.5.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.5.3/builds/4chan-X-noupdate.crx)]
+- Update for Recaptcha changes.
+
 **v1.13.5.2** *(2017-01-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.5.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.5.2/builds/4chan-X-noupdate.crx)]
 - Improvements to Sauce settings panel.
 - Minor bugfixes.

package.json

@@ -37,6 +37,7 @@
       "https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*",
       "https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*",
       "https://www.google.com/recaptcha/api2/frame?*&k=887877714&*",
+      "https://www.google.com/recaptcha/api2/bframe?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*",
       "*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*"
     ],
     "exclude_matches": [

src/Archive/archives.json

@@ -64,15 +64,6 @@
   "software": "foolfuuka",
   "boards": ["g", "jp", "mlp", "v"],
   "files": []
-}, {
-  "uid": 5,
-  "name": "Love is Over",
-  "domain": "archive.loveisover.me",
-  "http": true,
-  "https": false,
-  "software": "foolfuuka",
-  "boards": ["c", "d", "e", "i", "lgbt", "t", "u"],
-  "files": ["c", "d", "e", "i", "lgbt", "t", "u"]
 }, {
   "uid": 28,
   "name": "bstats",
@@ -82,6 +73,25 @@
   "software": "foolfuuka",
   "boards": ["f", "cm", "hm", "lgbt", "news", "qst", "trash", "y"],
   "files": []
+}, {
+  "uid": 32,
+  "name": "4tan",
+  "domain": "boards.4tan.org",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["3", "a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "news", "o", "out", "p", "po", "pol", "qa", "qst", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trash", "trv", "tv", "u", "v", "vg", "vip", "vp", "vr", "w", "wg", "wsg", "wsr", "x", "y"],
+  "files": [],
+  "reports": true
+}, {
+  "uid": 5,
+  "name": "Love is Over",
+  "domain": "archive.loveisover.me",
+  "http": true,
+  "https": false,
+  "software": "foolfuuka",
+  "boards": ["c", "d", "e", "i", "lgbt", "t", "u"],
+  "files": ["c", "d", "e", "i", "lgbt", "t", "u"]
 }, {
   "uid": 29,
   "name": "Archived.Moe",
@@ -111,14 +121,12 @@
   "boards": ["h", "hc", "hm", "r", "s", "soc"],
   "files": ["h", "hc", "hm", "r", "s", "soc"]
 }, {
-  "uid": 32,
+  "uid": 33,
-  "name": "4tan",
+  "name": "yeet.net",
-  "domain": "boards.4tan.org",
+  "domain": "yeet.net",
   "http": true,
-  "https": true,
+  "https": false,
   "software": "foolfuuka",
-  "boards": ["3", "a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "news", "o", "out", "p", "po", "pol", "qa", "qst", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trash", "trv", "tv", "u", "v", "vg", "vip", "vp", "vr", "w", "wg", "wsg", "wsr", "x", "y"],
+  "boards": ["g", "k", "qa"],
-  "files": [],
+  "files": ["g", "k", "qa"]
-  "search": [],
-  "reports": true
 }]

src/Posting/Captcha.fixes.coffee

@@ -45,7 +45,7 @@ Captcha.fixes =
   init: ->
     switch location.pathname.split('/')[3]
       when 'anchor'   then @initMain()
-      when 'frame'    then @initPopup()
+      when 'frame', 'bframe' then @initPopup()
       when 'fallback' then @initNoscript()
 
   initMain: ->