diff --git a/CHANGELOG.md b/CHANGELOG.md index d2148066a..c78ea3750 100755 --- a/CHANGELOG.md +++ b/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.15.10 +*2014-12-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.10/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Add `Post on Captcha Completion` option (default: off) to post when the captcha is completed rather than just focusing on the submit button. + ### v1.9.15.9 *2014-12-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.9/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index c921c2a46..b8017e99f 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.15.9 +* 4chan X - Version 1.9.15.10 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 58306751d..dbee8310f 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 84b6d394b..6fa4c60f9 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.9.15.9 +// @version 1.9.15.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index f9d533ce5..2b1d47d01 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.9.15.9 +// @version 1.9.15.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.9 +* 4chan X - Version 1.9.15.10 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -235,6 +235,7 @@ 'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'], 'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'], 'Auto-load captcha': [false, 'Automatically load the captcha in the QR even if your post is empty.'], + 'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.'], 'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.'] }, 'Quote Links': { @@ -390,7 +391,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.9', + VERSION: '1.9.15.10', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7561,29 +7562,30 @@ } }, save: function(pasted) { - var response, timeout, _base; - response = $('textarea', this.nodes.container).value; - timeout = (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE; - if (QR.cooldown.auto && this.needed()) { - this.shouldFocus = true; - this.reload(); - } else { - QR.nodes.status.focus(); - if (pasted) { - this.destroy(); - } else { - if ((_base = this.timeouts).destroy == null) { - _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); - } - } - } + var reload, _base; + reload = QR.cooldown.auto && this.needed(); $.forceSync('captchas'); this.captchas.push({ - response: response, - timeout: timeout + response: $('textarea', this.nodes.container).value, + timeout: (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE }); this.count(); - return $.set('captchas', this.captchas); + $.set('captchas', this.captchas); + if (reload) { + this.shouldFocus = true; + return this.reload(); + } + if (pasted) { + this.destroy(); + } else { + if ((_base = this.timeouts).destroy == null) { + _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); + } + } + QR.nodes.status.focus(); + if (Conf['Post on Captcha Completion']) { + return QR.submit(); + } }, clear: function() { var captcha, i, now, _i, _len, _ref; @@ -14058,7 +14060,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 6405e5ed6..343469c57 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 883928988..167878941 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.15.9 +// @version 1.9.15.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.9 +* 4chan X - Version 1.9.15.10 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -234,6 +234,7 @@ 'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'], 'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'], 'Auto-load captcha': [false, 'Automatically load the captcha in the QR even if your post is empty.'], + 'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.'], 'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.'] }, 'Quote Links': { @@ -389,7 +390,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.9', + VERSION: '1.9.15.10', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7560,29 +7561,30 @@ } }, save: function(pasted) { - var response, timeout, _base; - response = $('textarea', this.nodes.container).value; - timeout = (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE; - if (QR.cooldown.auto && this.needed()) { - this.shouldFocus = true; - this.reload(); - } else { - QR.nodes.status.focus(); - if (pasted) { - this.destroy(); - } else { - if ((_base = this.timeouts).destroy == null) { - _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); - } - } - } + var reload, _base; + reload = QR.cooldown.auto && this.needed(); $.forceSync('captchas'); this.captchas.push({ - response: response, - timeout: timeout + response: $('textarea', this.nodes.container).value, + timeout: (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE }); this.count(); - return $.set('captchas', this.captchas); + $.set('captchas', this.captchas); + if (reload) { + this.shouldFocus = true; + return this.reload(); + } + if (pasted) { + this.destroy(); + } else { + if ((_base = this.timeouts).destroy == null) { + _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); + } + } + QR.nodes.status.focus(); + if (Conf['Post on Captcha Completion']) { + return QR.submit(); + } }, clear: function() { var captcha, i, now, _i, _len, _ref; @@ -14057,7 +14059,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 8152e5d11..e1496578f 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 19be01e21..209e97e57 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.15.9 +// @version 1.9.15.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f3897e8cc..40da28d92 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.9.15.9 +// @version 1.9.15.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.9 +* 4chan X - Version 1.9.15.10 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -235,6 +235,7 @@ 'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'], 'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'], 'Auto-load captcha': [false, 'Automatically load the captcha in the QR even if your post is empty.'], + 'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.'], 'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.'] }, 'Quote Links': { @@ -390,7 +391,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.9', + VERSION: '1.9.15.10', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7561,29 +7562,30 @@ } }, save: function(pasted) { - var response, timeout, _base; - response = $('textarea', this.nodes.container).value; - timeout = (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE; - if (QR.cooldown.auto && this.needed()) { - this.shouldFocus = true; - this.reload(); - } else { - QR.nodes.status.focus(); - if (pasted) { - this.destroy(); - } else { - if ((_base = this.timeouts).destroy == null) { - _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); - } - } - } + var reload, _base; + reload = QR.cooldown.auto && this.needed(); $.forceSync('captchas'); this.captchas.push({ - response: response, - timeout: timeout + response: $('textarea', this.nodes.container).value, + timeout: (pasted ? this.setupTime : Date.now()) + 2 * $.MINUTE }); this.count(); - return $.set('captchas', this.captchas); + $.set('captchas', this.captchas); + if (reload) { + this.shouldFocus = true; + return this.reload(); + } + if (pasted) { + this.destroy(); + } else { + if ((_base = this.timeouts).destroy == null) { + _base.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); + } + } + QR.nodes.status.focus(); + if (Conf['Post on Captcha Completion']) { + return QR.submit(); + } }, clear: function() { var captcha, i, now, _i, _len, _ref; @@ -14058,7 +14060,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 0e65aec54..726b56d7d 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 0835d957a..abfea389c 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 753374ad3..b7a4e1c85 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 43b697c0f..fe7468160 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.15.9", + "version": "1.9.15.10", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",