diff --git a/.gitignore b/.gitignore index 9373d85ca..3d8070a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ node_modules/ *.db tmp-crx/ tmp-userscript/ -builds/4chan-X-Chrome.zip -builds/4chan-X-Opera.nex +builds/4chan-X.zip Gruntfile.js diff --git a/Gruntfile.coffee b/Gruntfile.coffee index bc8f3251b..146cf7480 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -168,10 +168,9 @@ module.exports = (grunt) -> grunt.registerTask 'release', [ 'build' + 'compress:crx' 'shell:commit' 'shell:push' - 'build-crx' - 'compress:crx' ] grunt.registerTask 'patch', [ 'bump' @@ -191,12 +190,11 @@ module.exports = (grunt) -> 'release' ] - grunt.registerTask 'updcl', 'Update the changelog', (headerLevel) -> - headerPrefix = new Array(+headerLevel + 1).join '#' - {version} = grunt.config 'pkg' - today = grunt.template.today 'yyyy-mm-dd' - changelog = grunt.file.read 'CHANGELOG.md' - - grunt.file.write 'CHANGELOG.md', "#{headerPrefix} #{version} - *#{today}*\n\n#{changelog}" - grunt.log.ok "Changelog updated for v#{version}." + grunt.registerTask 'updcl', 'Update the changelog', (i) -> + # i is the number of #s for markdown. + version = [] + version.length = +i + 1 + version = version.join('#') + ' v' + pkg.version + '\n*' + grunt.template.today('yyyy-mm-dd') + '*\n' + grunt.file.write 'CHANGELOG.md', version + '\n' + grunt.file.read('CHANGELOG.md') + grunt.log.ok 'Changelog updated for v' + pkg.version + '.' diff --git a/LICENSE b/LICENSE index d2ae960d0..468617e9f 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.25 - 2013-08-11 +* 4chan X - Version 1.2.25 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 6e5b6158b..48e699ae8 100755 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.25 - 2013-08-11 +* 4chan X - Version 1.2.25 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -9238,7 +9238,7 @@ Report = { init: function() { - if (!(/report/.test(location.search) && !d.cookie.contains('pass_enabled=1'))) { + if (!/report/.test(location.search)) { return; } return $.asap((function() { diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index c454f9717..3112aebc5 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -15,8 +15,7 @@ "run_at": "document_start" }], "homepage_url": "http://seaweedchan.github.io/4chan-x/", - "minimum_chrome_version": "27", - "minimum_opera_version": "15", + "minimum_chrome_version": "26", "permissions": [ "storage" ] diff --git a/builds/crx/script.js b/builds/crx/script.js index 3212c9033..c17fe44ba 100755 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.25 - 2013-08-11 +* 4chan X - Version 1.2.25 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -9224,7 +9224,7 @@ Report = { init: function() { - if (!(/report/.test(location.search) && !d.cookie.contains('pass_enabled=1'))) { + if (!/report/.test(location.search)) { return; } return $.asap((function() { diff --git a/json/archives.json b/json/archives.json deleted file mode 100755 index 95ac1a37a..000000000 --- a/json/archives.json +++ /dev/null @@ -1,110 +0,0 @@ -[{ - "uid": 0, - "name": "Foolz", - "domain": "archive.foolz.us", - "http": true, - "https": true, - "software": "foolfuuka", - "boards": ["a", "co", "gd", "jp", "m", "q", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], - "files": ["a", "gd", "jp", "m", "q", "tg", "vg", "vp", "vr", "wsg"] -}, { - "uid": 1, - "name": "NSFW Foolz", - "domain": "nsfw.foolz.us", - "http": true, - "https": true, - "software": "foolfuuka", - "boards": ["u"], - "files": ["u"] -}, { - "uid": 2, - "name": "The Dark Cave", - "domain": "archive.thedarkcave.org", - "http": true, - "https": true, - "software": "foolfuuka", - "boards": ["c", "int", "out", "po"], - "files": ["c", "po"] -}, { - "uid": 3, - "name": "4plebs", - "domain": "archive.4plebs.org", - "http": true, - "https": false, - "software": "foolfuuka", - "boards": ["hr", "tg", "tv", "x"], - "files": ["hr", "tg", "tv", "x"] -}, { - "uid": 4, - "name": "Nyafuu", - "domain": "archive.nyafuu.org", - "http": true, - "https": true, - "software": "foolfuuka", - "boards": ["c", "w", "wg"], - "files": ["c", "w", "wg"] -}, { - "uid": 11, - "name": "Foolz a Shit", - "domain": "archive.foolzashit.com", - "http": true, - "https": true, - "software": "foolfuuka", - "boards": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "pol", "s", "s4s", "t", "trv", "y"], - "files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"] -}, { - "uid": 12, - "name": "fap archive", - "domain": "fuuka.worldathleticproject.org", - "http": true, - "https": false, - "software": "foolfuuka", - "boards": ["b", "e", "h", "hc", "p", "s", "u"], - "files": ["b", "e", "h", "hc", "p", "s", "u"] -}, { - "uid": 7, - "name": "Install Gentoo", - "domain": "archive.installgentoo.net", - "http": false, - "https": true, - "software": "fuuka", - "boards": ["diy", "g", "sci"], - "files": [] -}, { - "uid": 8, - "name": "Rebecca Black Tech", - "domain": "rbt.asia", - "http": true, - "https": true, - "software": "fuuka", - "boards": ["cgl", "g", "mu", "w"], - "files": ["cgl", "g", "mu", "w"] -}, { - "uid": 9, - "name": "Heinessen", - "domain": "archive.heinessen.com", - "http": true, - "https": false, - "software": "fuuka", - "boards": ["an", "fit", "k", "mlp", "r9k", "toy"], - "files": ["an", "fit", "k", "r9k", "toy"] -}, { - "uid": 10, - "name": "warosu", - "domain": "fuuka.warosu.org", - "http": true, - "https": true, - "software": "fuuka", - "boards": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"], - "files": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"] -}, { - "uid": 13, - "name": "Foolz Beta", - "domain": "beta.foolz.us", - "http": true, - "https": true, - "withCredentials": true, - "software": "foolfuuka", - "boards": ["a", "co", "gd", "h", "jp", "m", "mlp", "q", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - "files": ["a", "gd", "h", "jp", "m", "q", "tg", "u", "vg", "vp", "vr", "wsg"] -}] diff --git a/src/General/meta/manifest.json b/src/General/meta/manifest.json index fb8cfba4e..b9793bda3 100755 --- a/src/General/meta/manifest.json +++ b/src/General/meta/manifest.json @@ -15,8 +15,7 @@ "run_at": "document_start" }], "homepage_url": "<%= meta.page %>", - "minimum_chrome_version": "27", - "minimum_opera_version": "15", + "minimum_chrome_version": "26", "permissions": [ "storage" ] diff --git a/src/Miscellaneous/Report.coffee b/src/Miscellaneous/Report.coffee index f0782aab5..109c55aa0 100755 --- a/src/Miscellaneous/Report.coffee +++ b/src/Miscellaneous/Report.coffee @@ -1,6 +1,6 @@ Report = init: -> - return unless /report/.test(location.search) and not d.cookie.contains 'pass_enabled=1' + return unless /report/.test(location.search) $.asap (-> $.id 'recaptcha_response_field'), Report.ready ready: -> field = $.id 'recaptcha_response_field'