diff --git a/CHANGELOG.md b/CHANGELOG.md index 505f7301b..618844d57 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,6 @@ **duckness**: - Merge changes from Mayhem fork -**ccd0**: -- Embedding for direct video links -- Merge changes from Mayhem fork - **MayhemYDG**: - Fix captcha submission: Captchas were reloaded the instant a post was submitted to 4chan. Unfortunately, a recent change to reCAPTCHA made it so reloading captchas invalidates the ones that loaded but not yet used. This is now fixed by only unloading the captcha, and only load new ones after the post is submitted.
@@ -73,8 +69,36 @@ - Fixed an issue with Thread Updater intervals not saving correctly. - Many spiffy performance, state awareness, and sanity improvements to JSON Navigation. +### v1.4.5 +*2014-04-03* + +**ccd0**: +- Add updater for Chrom* extension. + +### v1.4.4 +*2014-04-03* + +**ccd0**: +- Fix flag selector not being removed from post form. + +### v1.4.3 +*2014-04-03* + +**ccd0**: +- Fix [navigation bug](https://github.com/ccd0/4chan-x/issues/14) + +### v1.4.2 +*2014-04-02* + +**MayhemYDG**: +- Fix captcha not refreshing. +- Fix captcha submission:
+ Captchas were reloaded the instant a post was submitted to 4chan. Unfortunately, a recent change to reCAPTCHA made it so reloading captchas invalidates the ones that loaded but not yet used. This is now fixed by only unloading the captcha, and only load new ones after the post is submitted.
+ This also kills captcha caching, so the feature was removed. + ### v1.4.1 *2014-03-01* + **Spittie** - Check image dimension before uploading diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 280fb45a6..3eba81845 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -26,16 +26,16 @@ module.exports = (grunt) -> 'src/General/Get.coffee' 'src/General/UI.coffee' 'src/General/Notice.coffee' - 'src/Filtering/**/*' - 'src/Quotelinks/**/*' + 'src/Filtering/**/*.coffee' + 'src/Quotelinks/**/*.coffee' 'src/Posting/QR.coffee' - 'src/Posting/**/*' - 'src/Images/**/*' - 'src/Linkification/**/*' - 'src/Menu/**/*' - 'src/Monitoring/**/*' - 'src/Archive/**/*' - 'src/Miscellaneous/**/*' + 'src/Posting/**/*.coffee' + 'src/Images/**/*.coffee' + 'src/Linkification/**/*.coffee' + 'src/Menu/**/*.coffee' + 'src/Monitoring/**/*.coffee' + 'src/Archive/**/*.coffee' + 'src/Miscellaneous/**/*.coffee' 'src/General/Navigate.coffee' 'src/General/Settings.coffee' 'src/General/Main.coffee' @@ -50,6 +50,7 @@ module.exports = (grunt) -> crx: files: 'builds/crx/manifest.json': 'src/General/meta/manifest.json' + 'builds/updates.xml': 'src/General/meta/updates.xml' 'builds/crx/script.js': [ 'src/General/meta/botproc.js' 'src/General/meta/banner.js' diff --git a/LICENSE b/LICENSE index 24171b784..68772452b 100755 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ /* -* 4chan X - Version 1.4.1 - 2014-04-03 +* 4chan X - Version 1.4.5 - 2014-04-03 * * Licensed under the MIT license. -* https://github.com/Spittie/4chan-x/blob/master/LICENSE +* https://github.com/ccd0/4chan-x/blob/master/LICENSE * * Appchan X Copyright © 2013-2013 Zixaphir * http://zixaphir.github.io/appchan-x/ diff --git a/README.md b/README.md index eeaee6494..f62fa29d4 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Personal fork of Seaweed's 4chan X. +Personal fork of Spittie's 4chan X. -#### [Why 4chan X needs to access data on every site?](https://github.com/Spittie/4chan-x/wiki/Why-4chan-X-needs-to-access-data-from-every-website%3F) +#### [Why 4chan X needs to access data on every site?](https://github.com/ccd0/4chan-x/wiki/Why-4chan-X-needs-to-access-data-from-every-website%3F) ##[Install](../../raw/master/builds/4chan-X.user.js) (Firefox) ##[Install](../../raw/master/builds/crx.crx) (Chrom*) diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index c057f780d..524f9a534 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,11 +1,11 @@ // ==UserScript== // @name 4chan X -// @version 1.4.1 +// @version 1.4.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. -// @license MIT; https://github.com/Spittie/4chan-x/blob/master/LICENSE +// @license MIT; https://github.com/ccd0/4chan-x/blob/master/LICENSE // @match *://boards.4chan.org/* // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* @@ -17,7 +17,7 @@ // @grant GM_openInTab // @grant GM_xmlhttpRequest // @run-at document-start -// @updateURL https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.meta.js -// @downloadURL https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.user.js +// @updateURL https://github.com/ccd0/4chan-x/raw/stable/builds/4chan-X.meta.js +// @downloadURL https://github.com/ccd0/4chan-x/raw/stable/builds/4chan-X.user.js // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAF5JREFUeNrtkTESABAQxPD/R6tsE2dUGYUtFJvLDKf93KevHJAjpBorAQWSBIKqFASC4G0pCAkm4GfaEvgYXl0T6HBaE97f0vmnfYHbZOMLZCx9ISdKWwjOWZSC8GYm4SUGwfYgqI4AAAAASUVORK5CYII= // ==/UserScript== diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f7deed169..b740197b4 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,12 +1,12 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.4.1 +// @version 1.4.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. -// @license MIT; https://github.com/Spittie/4chan-x/blob/master/LICENSE +// @license MIT; https://github.com/ccd0/4chan-x/blob/master/LICENSE // @match *://boards.4chan.org/* // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* @@ -18,16 +18,16 @@ // @grant GM_openInTab // @grant GM_xmlhttpRequest // @run-at document-start -// @updateURL https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.meta.js -// @downloadURL https://github.com/Spittie/4chan-x/raw/stable/builds/4chan-X.user.js +// @updateURL https://github.com/ccd0/4chan-x/raw/stable/builds/4chan-X.meta.js +// @downloadURL https://github.com/ccd0/4chan-x/raw/stable/builds/4chan-X.user.js // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAF5JREFUeNrtkTESABAQxPD/R6tsE2dUGYUtFJvLDKf93KevHJAjpBorAQWSBIKqFASC4G0pCAkm4GfaEvgYXl0T6HBaE97f0vmnfYHbZOMLZCx9ISdKWwjOWZSC8GYm4SUGwfYgqI4AAAAASUVORK5CYII= // ==/UserScript== /* -* 4chan X - Version 1.4.1 - 2014-04-03 +* 4chan X - Version 1.4.5 - 2014-04-03 * * Licensed under the MIT license. -* https://github.com/Spittie/4chan-x/blob/master/LICENSE +* https://github.com/ccd0/4chan-x/blob/master/LICENSE * * Appchan X Copyright © 2013-2013 Zixaphir * http://zixaphir.github.io/appchan-x/ @@ -296,7 +296,7 @@ 'Shortcut Icons': true, 'Custom Board Navigation': true }, - boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]", + boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { 'QR.personas': "#email:\"sage\";boards:jp;always" }, @@ -368,7 +368,7 @@ doc = d.documentElement; g = { - VERSION: '1.4.1', + VERSION: '1.4.5', NAMESPACE: '4chan X.', boards: {} }; @@ -6591,9 +6591,9 @@ if (!nodes) { return; } - if (nodes.flagSelector) { - $.rm(nodes.flagSelector); - delete nodes.flagSelector; + if (nodes.flag) { + $.rm(nodes.flag); + delete nodes.flag; } if (g.BOARD.ID === 'pol') { flag = QR.flags(); @@ -6698,7 +6698,7 @@ QR.cooldown.auto = false; QR.status(); return QR.error($.el('span', { - innerHTML: "4chan X encountered an error while posting. \n[Banned?] [More info]" + innerHTML: "4chan X encountered an error while posting. \n[Banned?] [More info]" })); } }; @@ -12885,7 +12885,7 @@ return; } $.event('CloseMenu'); - html = "
"; + html = "
"; Settings.overlay = overlay = $.el('div', { id: 'overlay' }); @@ -13717,7 +13717,7 @@ return; } if (previousversion) { - changelog = 'https://github.com/Spittie/4chan-x/blob/master/CHANGELOG.md'; + changelog = 'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md'; el = $.el('span', { innerHTML: "4chan X has been updated to version " + g.VERSION + "." }); diff --git a/builds/crx.crx b/builds/crx.crx index a1dfc40c7..d6f999455 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 62a6e1894..824b97af7 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.4.1", + "version": "1.4.5", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { @@ -14,7 +14,8 @@ "all_frames": true, "run_at": "document_start" }], - "homepage_url": "http://seaweedchan.github.io/4chan-x/", + "homepage_url": "https://github.com/ccd0/4chan-x", + "update_url": "https://github.com/ccd0/4chan-x/raw/master/builds/updates.xml", "minimum_chrome_version": "32", "permissions": [ "storage", diff --git a/builds/crx/script.js b/builds/crx/script.js index f13d1400c..6179f51b2 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,9 +1,9 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.4.1 - 2014-04-03 +* 4chan X - Version 1.4.5 - 2014-04-03 * * Licensed under the MIT license. -* https://github.com/Spittie/4chan-x/blob/master/LICENSE +* https://github.com/ccd0/4chan-x/blob/master/LICENSE * * Appchan X Copyright © 2013-2013 Zixaphir * http://zixaphir.github.io/appchan-x/ @@ -272,7 +272,7 @@ 'Shortcut Icons': true, 'Custom Board Navigation': true }, - boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]", + boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { 'QR.personas': "#email:\"sage\";boards:jp;always" }, @@ -344,7 +344,7 @@ doc = d.documentElement; g = { - VERSION: '1.4.1', + VERSION: '1.4.5', NAMESPACE: '4chan X.', boards: {} }; @@ -6636,9 +6636,9 @@ if (!nodes) { return; } - if (nodes.flagSelector) { - $.rm(nodes.flagSelector); - delete nodes.flagSelector; + if (nodes.flag) { + $.rm(nodes.flag); + delete nodes.flag; } if (g.BOARD.ID === 'pol') { flag = QR.flags(); @@ -6743,7 +6743,7 @@ QR.cooldown.auto = false; QR.status(); return QR.error($.el('span', { - innerHTML: "4chan X encountered an error while posting. \n[Banned?] [More info]" + innerHTML: "4chan X encountered an error while posting. \n[Banned?] [More info]" })); } }; @@ -12906,7 +12906,7 @@ return; } $.event('CloseMenu'); - html = "
"; + html = "
"; Settings.overlay = overlay = $.el('div', { id: 'overlay' }); @@ -13721,7 +13721,7 @@ return; } if (previousversion) { - changelog = 'https://github.com/Spittie/4chan-x/blob/master/CHANGELOG.md'; + changelog = 'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md'; el = $.el('span', { innerHTML: "4chan X has been updated to version " + g.VERSION + "." }); diff --git a/builds/updates.xml b/builds/updates.xml new file mode 100644 index 000000000..8096ce6f6 --- /dev/null +++ b/builds/updates.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/latest.js b/latest.js index 3b382428a..ba432318f 100755 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.4.1'},'*') +postMessage({version:'1.4.5'},'*') diff --git a/package.json b/package.json index e3291d38f..98b361b99 100755 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "4chan-X", - "version": "1.4.1", + "version": "1.4.5", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "repo": "https://github.com/Spittie/4chan-x/", - "page": "http://seaweedchan.github.io/4chan-x/", + "repo": "https://github.com/ccd0/4chan-x/", + "page": "https://github.com/ccd0/4chan-x", "buildsPath": "builds/", "mainBranch": "master", "matches": [ @@ -40,7 +40,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/seaweedchan/4chan-x.git" + "url": "https://github.com/ccd0/4chan-x.git" }, "author": "seaweedchan ", "contributors": [ diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 3e4f2db18..d262d92e9 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -538,7 +538,7 @@ mu-replace sp-replace tv-replace vp-replace -[external-text:"FAQ","https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions"] +[external-text:"FAQ","https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions"] """ QR: diff --git a/src/General/meta/manifest.json b/src/General/meta/manifest.json index cb022ecea..b9401d1e3 100755 --- a/src/General/meta/manifest.json +++ b/src/General/meta/manifest.json @@ -15,6 +15,7 @@ "run_at": "document_start" }], "homepage_url": "<%= meta.page %>", + "update_url": "<%= meta.repo %>raw/master/builds/updates.xml", "minimum_chrome_version": "<%= meta.min.chrome %>", "permissions": [ "storage", diff --git a/src/General/meta/updates.xml b/src/General/meta/updates.xml new file mode 100644 index 000000000..4b3f6b662 --- /dev/null +++ b/src/General/meta/updates.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 88fcb9459..495baf635 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -587,9 +587,9 @@ QR = flagsInput: -> {nodes} = QR return unless nodes - if nodes.flagSelector - $.rm nodes.flagSelector - delete nodes.flagSelector + if nodes.flag + $.rm nodes.flag + delete nodes.flag if g.BOARD.ID is 'pol' flag = QR.flags() @@ -690,7 +690,7 @@ QR = QR.error $.el 'span', innerHTML: """ 4chan X encountered an error while posting. - [Banned?] [More info] + [Banned?] [More info] """ extra = form: $.formData formData