diff --git a/CHANGELOG.md b/CHANGELOG.md index 308e487f8..285f09cc5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ +### v1.3.4 +*2014-02-10* + +**Spittie** +- Fix Chrome (Maybe? Hopefully I haven't fucked everything) +- Add fgst.eu +- Add mawa.re + ### v1.3.3 *2014-02-09* + **MayhemYDG** - Fix new captcha diff --git a/LICENSE b/LICENSE index 30b0d0426..a5107c9eb 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.3.3 - 2014-02-09 +* 4chan X - Version 1.3.4 - 2014-02-10 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 898396532..853efc1ca 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.3.3 +// @version 1.3.4 // @minGMVer 1.13 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 845d8e2b7..2524ea6ce 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.3.3 +// @version 1.3.4 // @minGMVer 1.13 // @minFFVer 26 // @namespace 4chan-X @@ -22,7 +22,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.3.3 - 2014-02-09 +* 4chan X - Version 1.3.4 - 2014-02-10 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -358,7 +358,7 @@ doc = d.documentElement; g = { - VERSION: '1.3.3', + VERSION: '1.3.4', NAMESPACE: '4chan X.', boards: {}, threads: {}, @@ -1980,8 +1980,7 @@ args = bottom ? ['bottom-header', 'top-header', 'bottom', 'after'] : ['top-header', 'bottom-header', 'top', 'add']; $.addClass(doc, args[0]); $.rmClass(doc, args[1]); - Header.bar.parentNode.className = args[2]; - return $[args[3]](Header.bar, Header.notify); + return Header.bar.parentNode.className = args[2]; }, toggleBarPosition: function() { $.cb.checked.call(this); @@ -6140,14 +6139,21 @@ input: input }; $.on(input, 'focus', this.setup); + $.on(input, 'focus', function() { + return $.addClass(QR.nodes.el, 'focus'); + }); + $.on(input, 'blur', function() { + return $.rmClass(QR.nodes.el, 'focus'); + }); $.on(input, 'blur', QR.focusout); $.on(input, 'focus', QR.focusin); $.addClass(QR.nodes.el, 'has-captcha'); $.after(QR.nodes.com.parentNode, [imgContainer, input]); this.setupObserver = new MutationObserver(this.afterSetup); - return this.setupObserver.observe(container, { + this.setupObserver.observe(container, { childList: true }); + return this.afterSetup(); }, setup: function() { return $.globalEval('loadRecaptcha()'); @@ -9964,6 +9970,26 @@ software: "fuuka" } }, + "fgst": { + boards: ["r", "soc"], + files: ["r", "soc"], + data: { + domain: "fgst.eu", + http: true, + https: true, + software: "foolfuuka" + } + }, + "maware": { + boards: ["t"], + files: ["t"], + data: { + domain: "archive.mawa.re", + http: true, + https: false, + software: "foolfuuka" + } + }, "Foolz Beta": { boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"], diff --git a/builds/4chanx.crx b/builds/4chanx.crx deleted file mode 100644 index 0c09b49e9..000000000 Binary files a/builds/4chanx.crx and /dev/null differ diff --git a/builds/crx.crx b/builds/crx.crx new file mode 100644 index 000000000..0850f46b0 Binary files /dev/null and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 17518ddd3..e8c7f6fc4 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.3.3", + "version": "1.3.4", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index dccdd9c06..44947f933 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.3.3 - 2014-02-09 +* 4chan X - Version 1.3.4 - 2014-02-10 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -336,7 +336,7 @@ doc = d.documentElement; g = { - VERSION: '1.3.3', + VERSION: '1.3.4', NAMESPACE: '4chan X.', boards: {}, threads: {}, @@ -1990,8 +1990,7 @@ args = bottom ? ['bottom-header', 'top-header', 'bottom', 'after'] : ['top-header', 'bottom-header', 'top', 'add']; $.addClass(doc, args[0]); $.rmClass(doc, args[1]); - Header.bar.parentNode.className = args[2]; - return $[args[3]](Header.bar, Header.notify); + return Header.bar.parentNode.className = args[2]; }, toggleBarPosition: function() { $.cb.checked.call(this); @@ -6131,12 +6130,19 @@ input: input }; $.on(input, 'focus', this.setup); + $.on(input, 'focus', function() { + return $.addClass(QR.nodes.el, 'focus'); + }); + $.on(input, 'blur', function() { + return $.rmClass(QR.nodes.el, 'focus'); + }); $.addClass(QR.nodes.el, 'has-captcha'); $.after(QR.nodes.com.parentNode, [imgContainer, input]); this.setupObserver = new MutationObserver(this.afterSetup); - return this.setupObserver.observe(container, { + this.setupObserver.observe(container, { childList: true }); + return this.afterSetup(); }, setup: function() { return $.globalEval('loadRecaptcha()'); @@ -9953,6 +9959,26 @@ software: "fuuka" } }, + "fgst": { + boards: ["r", "soc"], + files: ["r", "soc"], + data: { + domain: "fgst.eu", + http: true, + https: true, + software: "foolfuuka" + } + }, + "maware": { + boards: ["t"], + files: ["t"], + data: { + domain: "archive.mawa.re", + http: true, + https: false, + software: "foolfuuka" + } + }, "Foolz Beta": { boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"], diff --git a/latest.js b/latest.js index acb612661..2fa3c50e2 100755 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.3.3'},'*') +postMessage({version:'1.3.4'},'*') diff --git a/package.json b/package.json index 8ffc6e4f9..c27cc9881 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.3.3", + "version": "1.3.4", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", diff --git a/src/General/Header.coffee b/src/General/Header.coffee index a6eec0c65..b63b75b8e 100755 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -329,8 +329,8 @@ Header = $.addClass doc, args[0] $.rmClass doc, args[1] - Header.bar.parentNode.className = args[2] - $[args[3]] Header.bar, Header.notify + Header.bar.parentNode.className = args[2] + #$[args[3]] Header.bar, Header.notify ##Fix chrome? toggleBarPosition: -> $.cb.checked.call @ diff --git a/src/Posting/QR.captcha.coffee b/src/Posting/QR.captcha.coffee index e32a59377..93ad03274 100644 --- a/src/Posting/QR.captcha.coffee +++ b/src/Posting/QR.captcha.coffee @@ -21,6 +21,8 @@ QR.captcha = input: input $.on input, 'focus', @setup + $.on input, 'focus', -> $.addClass QR.nodes.el, 'focus' + $.on input, 'blur', -> $.rmClass QR.nodes.el, 'focus' <% if (type === 'userscript') { %> # XXX Firefox lacks focusin/focusout support.