From b83e536c86a5a6d98dffba76ffae56f1c8e3d523 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Thu, 1 Aug 2013 20:34:00 +0200 Subject: [PATCH 01/14] Don't save the unread count if the thread is dead. --- src/Monitoring/Unread.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Monitoring/Unread.coffee b/src/Monitoring/Unread.coffee index ff816c6b8..c31c63b56 100644 --- a/src/Monitoring/Unread.coffee +++ b/src/Monitoring/Unread.coffee @@ -132,6 +132,7 @@ Unread = Unread.update() if e saveLastReadPost: -> + return if Unread.thread.isDead Unread.db.set boardID: Unread.thread.board.ID threadID: Unread.thread.ID From e07346a35f3a3ef564754e42787ca408e4514b10 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Thu, 1 Aug 2013 21:42:53 +0200 Subject: [PATCH 02/14] 'use strict'; --- Gruntfile.js | 2 ++ src/Meta/usestrict.js | 1 + 2 files changed, 3 insertions(+) create mode 100644 src/Meta/usestrict.js diff --git a/Gruntfile.js b/Gruntfile.js index 69100ad0f..7eeca8da7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -52,6 +52,7 @@ module.exports = function(grunt) { 'builds/crx/manifest.json': 'src/Meta/manifest.json', 'builds/crx/script.js': [ 'src/Meta/banner.js', + 'src/Meta/usestrict.js', 'tmp-<%= pkg.type %>/script.js' ] } @@ -63,6 +64,7 @@ module.exports = function(grunt) { 'builds/<%= pkg.name %>.user.js': [ 'src/Meta/metadata.js', 'src/Meta/banner.js', + 'src/Meta/usestrict.js', 'tmp-<%= pkg.type %>/script.js' ] } diff --git a/src/Meta/usestrict.js b/src/Meta/usestrict.js new file mode 100644 index 000000000..ad9a93a7c --- /dev/null +++ b/src/Meta/usestrict.js @@ -0,0 +1 @@ +'use strict'; From e5db696b87674e91cdeaa30f713b325fddbbfc57 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Thu, 1 Aug 2013 21:51:26 +0200 Subject: [PATCH 03/14] Remove the .webkit class. Use .blink instead. --- src/General/Main.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 197e7aa50..0105d43f6 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -125,7 +125,6 @@ Main = # disable the mobile layout $('link[href*=mobile]', d.head)?.disabled = true <% if (type === 'crx') { %> - $.addClass doc, 'webkit' $.addClass doc, 'blink' <% } else { %> $.addClass doc, 'gecko' From 03a8435a94fee6c68214ab8c6510cbd5890b2103 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Thu, 1 Aug 2013 22:10:51 +0200 Subject: [PATCH 04/14] Fix duplicate data property in object literal not allowed in strict mode. --- src/Archive/Redirect.coffee | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index 8cf6954bb..edc4e621c 100644 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -1,8 +1,9 @@ Redirect = archives: `<%= JSON.stringify(grunt.file.readJSON('json/archives.json')) %>` - thread: {} - post: {} - file: {} + data: + thread: {} + post: {} + file: {} init: -> for boardID, data of Conf['selectedArchives'] @@ -13,15 +14,15 @@ Redirect = archive.files else archive.boards - Redirect[type][boardID] = archive if boardID in arr + Redirect.data[type][boardID] = archive if boardID in arr for archive in Conf['archives'] for boardID in archive.boards - unless boardID of Redirect.thread - Redirect.thread[boardID] = archive - unless boardID of Redirect.post or archive.software isnt 'foolfuuka' - Redirect.post[boardID] = archive - unless boardID of Redirect.file or boardID not in archive.files - Redirect.file[boardID] = archive + unless boardID of Redirect.data.thread + Redirect.data.thread[boardID] = archive + unless boardID of Redirect.data.post or archive.software isnt 'foolfuuka' + Redirect.data.post[boardID] = archive + unless boardID of Redirect.data.file or boardID not in archive.files + Redirect.data.file[boardID] = archive Redirect.update() @@ -40,7 +41,7 @@ Redirect = cb? now to: (dest, data) -> - archive = (if dest is 'search' then Redirect.thread else Redirect[dest])[data.boardID] + archive = (if dest is 'search' then Redirect.data.thread else Redirect.data[dest])[data.boardID] return '' unless archive Redirect[dest] archive, data From 4c97408c26f9cdac7db3b59f040b0414dbc0d734 Mon Sep 17 00:00:00 2001 From: NemDiggers Date: Fri, 2 Aug 2013 03:08:52 -0400 Subject: [PATCH 05/14] Rename archive; add support for /hc/ --- json/archives.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json/archives.json b/json/archives.json index 8fd76aebf..42edc592c 100644 --- a/json/archives.json +++ b/json/archives.json @@ -54,13 +54,13 @@ "files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"] }, { "uid": 12, - "name": "worldathleticproject", + "name": "fap archive", "domain": "fuuka.worldathleticproject.org", "http": true, "https": false, "software": "foolfuuka", - "boards": ["e", "h", "p", "s", "u"], - "files": ["e", "h", "p", "s", "u"] + "boards": ["e", "h", "p", "s", "u", "hc"], + "files": ["e", "h", "p", "s", "u", "hc"] }, { "uid": 7, "name": "Install Gentoo", From 46c57947ce77320ee6f03e7b7f4dbd9fa776cfce Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 2 Aug 2013 09:53:25 +0200 Subject: [PATCH 06/14] Sort "fap archive" boards & files arrays. --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index 42edc592c..b59fa5145 100644 --- a/json/archives.json +++ b/json/archives.json @@ -59,8 +59,8 @@ "http": true, "https": false, "software": "foolfuuka", - "boards": ["e", "h", "p", "s", "u", "hc"], - "files": ["e", "h", "p", "s", "u", "hc"] + "boards": ["e", "h", "hc", "p", "s", "u"], + "files": ["e", "h", "hc", "p", "s", "u"] }, { "uid": 7, "name": "Install Gentoo", From 6d3afcd005b66aaf1f13a8cc8db27b37f862fd6b Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 2 Aug 2013 21:13:32 +0200 Subject: [PATCH 07/14] Simplify $.open with GM_openInTab. --- lib/$.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/$.coffee b/lib/$.coffee index 2d7da3708..811614b78 100644 --- a/lib/$.coffee +++ b/lib/$.coffee @@ -147,7 +147,7 @@ $.off = (el, events, handler) -> $.event = (event, detail, root=d) -> root.dispatchEvent new CustomEvent event, {bubbles: true, detail} <% if (type === 'userscript') { %> -$.open = (URL) -> GM_openInTab URL +$.open = GM_openInTab <% } else { %> $.open = (URL) -> window.open URL, '_blank' <% } %> From eef94f971cc75c9350b2ef200b398feeeed18851 Mon Sep 17 00:00:00 2001 From: James Campos Date: Fri, 2 Aug 2013 15:12:10 -0700 Subject: [PATCH 08/14] Gruntfile.js -> Gruntfile.coffee Close #1209 --- Gruntfile.coffee | 181 +++++++++++++++++++++++++++++++++++++++++ Gruntfile.js | 208 ----------------------------------------------- 2 files changed, 181 insertions(+), 208 deletions(-) create mode 100644 Gruntfile.coffee delete mode 100644 Gruntfile.js diff --git a/Gruntfile.coffee b/Gruntfile.coffee new file mode 100644 index 000000000..ce531b6c7 --- /dev/null +++ b/Gruntfile.coffee @@ -0,0 +1,181 @@ +module.exports = (grunt) -> + + concatOptions = + process: Object.create(null, data: + get: -> grunt.config 'pkg' + enumerable: true + ) + shellOptions = + stdout: true + stderr: true + failOnError: true + + # Project configuration. + grunt.initConfig + pkg: grunt.file.readJSON 'package.json' + concat: + coffee: + options: concatOptions + src: [ + 'src/General/Config.coffee' + 'src/General/Globals.coffee' + 'lib/**/*' + 'src/General/UI.coffee' + 'src/General/Header.coffee' + 'src/General/Notification.coffee' + 'src/General/Settings.coffee' + 'src/General/Get.coffee' + 'src/General/Build.coffee' + # Features --> + 'src/Filtering/**/*' + 'src/Quotelinks/**/*' + 'src/Posting/**/*' + 'src/Images/**/*' + 'src/Menu/**/*' + 'src/Monitoring/**/*' + 'src/Archive/**/*' + 'src/Miscellaneous/**/*' + # <--| + 'src/General/Board.coffee' + 'src/General/Thread.coffee' + 'src/General/Post.coffee' + 'src/General/Clone.coffee' + 'src/General/DataBoard.coffee' + 'src/General/Main.coffee' + ] + dest: 'tmp-<%= pkg.type %>/script.coffee' + crx: + options: concatOptions + files: + 'builds/crx/manifest.json': 'src/Meta/manifest.json' + 'builds/crx/script.js': [ + 'src/Meta/banner.js' + 'src/Meta/usestrict.js' + 'tmp-<%= pkg.type %>/script.js' + ] + userscript: + options: concatOptions + files: + 'builds/<%= pkg.name %>.meta.js': 'src/Meta/metadata.js' + 'builds/<%= pkg.name %>.user.js': [ + 'src/Meta/metadata.js' + 'src/Meta/banner.js' + 'src/Meta/usestrict.js' + 'tmp-<%= pkg.type %>/script.js' + ] + copy: + crx: + src: 'img/*.png' + dest: 'builds/crx/' + expand: true + flatten: true + # for_d19 + # 19 juin 2013 10:32:22 + # We're currently sniffing the type of the file based on file extension. + # We have a different type of content, Themes, which use a pure zip-file with a .zip ending. + # This solution is sub-optimal and will be changed in the future. + # For now, upload an unsigned ZIP-file with the ending .nex or .crx. + nex: + src: 'builds/<%= pkg.name %>.zip' + dest: 'builds/<%= pkg.name %>.nex' + coffee: + script: + src: 'tmp-<%= pkg.type %>/script.coffee' + dest: 'tmp-<%= pkg.type %>/script.js' + concurrent: + build: ['build-crx', 'build-userscript'] + bump: + options: + updateConfigs: ['pkg'] + commit: false + createTag: false + push: false + shell: + commit: + options: shellOptions + command: [ + 'git checkout <%= pkg.meta.mainBranch %>' + 'git commit -am "Release <%= pkg.meta.name %> v<%= pkg.version %>."' + 'git tag -a <%= pkg.version %> -m "<%= pkg.meta.name %> v<%= pkg.version %>."' + 'git tag -af stable-v3 -m "<%= pkg.meta.name %> v<%= pkg.version %>."' + ].join(' && ') + push: + options: shellOptions + command: 'git push origin --tags -f && git push origin --all' + watch: + all: + options: + interrupt: true + files: [ + 'Gruntfile.coffee' + 'package.json' + 'lib/**/*' + 'src/**/*' + 'html/**/*' + 'css/**/*' + 'json/**/*' + 'img/**/*' + ] + tasks: 'build' + compress: + crx: + options: + archive: 'builds/<%= pkg.name %>.zip' + level: 9 + pretty: true + expand: true + flatten: true + src: 'builds/crx/*' + dest: '/' + clean: + builds: 'builds' + tmpcrx: 'tmp-crx' + tmpuserscript: 'tmp-userscript' + + grunt.loadNpmTasks 'grunt-bump' + grunt.loadNpmTasks 'grunt-concurrent' + grunt.loadNpmTasks 'grunt-contrib-clean' + grunt.loadNpmTasks 'grunt-contrib-coffee' + grunt.loadNpmTasks 'grunt-contrib-compress' + grunt.loadNpmTasks 'grunt-contrib-concat' + grunt.loadNpmTasks 'grunt-contrib-copy' + grunt.loadNpmTasks 'grunt-contrib-watch' + grunt.loadNpmTasks 'grunt-shell' + + grunt.registerTask 'default', ['build'] + + grunt.registerTask 'set-build', 'Set the build type variable', (type) -> + pkg = grunt.config 'pkg' + pkg.type = type + grunt.config 'pkg', pkg + grunt.log.ok 'pkg.type = %s', type + grunt.registerTask 'build', ['concurrent:build'] + grunt.registerTask 'build-crx', [ + 'set-build:crx' + 'concat:coffee' + 'coffee:script' + 'concat:crx' + 'copy:crx' + 'clean:tmpcrx' + ] + grunt.registerTask 'build-userscript', [ + 'set-build:userscript' + 'concat:coffee' + 'coffee:script' + 'concat:userscript' + 'clean:tmpuserscript' + ] + + grunt.registerTask 'release', ['shell:commit', 'shell:push', 'build-crx', 'compress:crx', 'copy:nex'] + grunt.registerTask 'patch', ['bump', 'updcl:3', 'release'] + grunt.registerTask 'minor', ['bump:minor', 'updcl:2', 'release'] + grunt.registerTask 'major', ['bump:major', 'updcl:1', '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}." diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 7eeca8da7..000000000 --- a/Gruntfile.js +++ /dev/null @@ -1,208 +0,0 @@ -module.exports = function(grunt) { - - var concatOptions = { - process: { - get data() { return grunt.config('pkg'); } - } - }; - var shellOptions = { - stdout: true, - stderr: true, - failOnError: true - }; - - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - concat: { - coffee: { - options: concatOptions, - src: [ - 'src/General/Config.coffee', - 'src/General/Globals.coffee', - 'lib/**/*', - 'src/General/UI.coffee', - 'src/General/Header.coffee', - 'src/General/Notification.coffee', - 'src/General/Settings.coffee', - 'src/General/Get.coffee', - 'src/General/Build.coffee', - // Features --> - 'src/Filtering/**/*', - 'src/Quotelinks/**/*', - 'src/Posting/**/*', - 'src/Images/**/*', - 'src/Menu/**/*', - 'src/Monitoring/**/*', - 'src/Archive/**/*', - 'src/Miscellaneous/**/*', - // <--| - 'src/General/Board.coffee', - 'src/General/Thread.coffee', - 'src/General/Post.coffee', - 'src/General/Clone.coffee', - 'src/General/DataBoard.coffee', - 'src/General/Main.coffee' - ], - dest: 'tmp-<%= pkg.type %>/script.coffee' - }, - crx: { - options: concatOptions, - files: { - 'builds/crx/manifest.json': 'src/Meta/manifest.json', - 'builds/crx/script.js': [ - 'src/Meta/banner.js', - 'src/Meta/usestrict.js', - 'tmp-<%= pkg.type %>/script.js' - ] - } - }, - userscript: { - options: concatOptions, - files: { - 'builds/<%= pkg.name %>.meta.js': 'src/Meta/metadata.js', - 'builds/<%= pkg.name %>.user.js': [ - 'src/Meta/metadata.js', - 'src/Meta/banner.js', - 'src/Meta/usestrict.js', - 'tmp-<%= pkg.type %>/script.js' - ] - } - } - }, - copy: { - crx: { - src: 'img/*.png', - dest: 'builds/crx/', - expand: true, - flatten: true - }, - // for_d19 - // 19 juin 2013 10:32:22 - // We're currently sniffing the type of the file based on file extension. - // We have a different type of content, Themes, which use a pure zip-file with a .zip ending. - // This solution is sub-optimal and will be changed in the future. - // For now, upload an unsigned ZIP-file with the ending .nex or .crx. - nex: { - src: 'builds/<%= pkg.name %>.zip', - dest: 'builds/<%= pkg.name %>.nex' - } - }, - coffee: { - script: { - src: 'tmp-<%= pkg.type %>/script.coffee', - dest: 'tmp-<%= pkg.type %>/script.js' - } - }, - concurrent: { - build: ['build-crx', 'build-userscript'] - }, - bump: { - options: { - updateConfigs: ['pkg'], - commit: false, - createTag: false, - push: false - } - }, - shell: { - commit: { - options: shellOptions, - command: [ - 'git checkout <%= pkg.meta.mainBranch %>', - 'git commit -am "Release <%= pkg.meta.name %> v<%= pkg.version %>."', - 'git tag -a <%= pkg.version %> -m "<%= pkg.meta.name %> v<%= pkg.version %>."', - 'git tag -af stable-v3 -m "<%= pkg.meta.name %> v<%= pkg.version %>."' - ].join(' && ') - }, - push: { - options: shellOptions, - command: 'git push origin --tags -f && git push origin --all' - } - }, - watch: { - all: { - options: { - interrupt: true - }, - files: [ - 'Gruntfile.js', - 'package.json', - 'lib/**/*', - 'src/**/*', - 'html/**/*', - 'css/**/*', - 'json/**/*', - 'img/**/*' - ], - tasks: 'build' - } - }, - compress: { - crx: { - options: { - archive: 'builds/<%= pkg.name %>.zip', - level: 9, - pretty: true - }, - expand: true, - flatten: true, - src: 'builds/crx/*', - dest: '/' - } - }, - clean: { - builds: 'builds', - tmpcrx: 'tmp-crx', - tmpuserscript: 'tmp-userscript' - } - }); - - grunt.loadNpmTasks('grunt-bump'); - grunt.loadNpmTasks('grunt-concurrent'); - grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.loadNpmTasks('grunt-contrib-coffee'); - grunt.loadNpmTasks('grunt-contrib-compress'); - grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-copy'); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-shell'); - - grunt.registerTask('default', ['build']); - - grunt.registerTask('set-build', 'Set the build type variable', function(type) { - var pkg = grunt.config('pkg'); - pkg.type = type; - grunt.config('pkg', pkg); - grunt.log.ok('pkg.type = %s', type); - }); - grunt.registerTask('build', ['concurrent:build']); - grunt.registerTask('build-crx', [ - 'set-build:crx', - 'concat:coffee', - 'coffee:script', - 'concat:crx', - 'copy:crx', - 'clean:tmpcrx' - ]); - grunt.registerTask('build-userscript', [ - 'set-build:userscript', - 'concat:coffee', - 'coffee:script', - 'concat:userscript', - 'clean:tmpuserscript' - ]); - - grunt.registerTask('release', ['shell:commit', 'shell:push', 'build-crx', 'compress:crx', 'copy:nex']); - grunt.registerTask('patch', ['bump', 'updcl:3', 'release']); - grunt.registerTask('minor', ['bump:minor', 'updcl:2', 'release']); - grunt.registerTask('major', ['bump:major', 'updcl:1', 'release']); - - grunt.registerTask('updcl', 'Update the changelog', function(i) { - // i is the number of #s for markdown. - var pkg = grunt.config('pkg'); - var version = new Array(+i + 1).join('#') + ' ' + pkg.version + ' - *' + grunt.template.today('yyyy-mm-dd') + '*'; - grunt.file.write('CHANGELOG.md', version + '\n\n' + grunt.file.read('CHANGELOG.md')); - grunt.log.ok('Changelog updated for v' + pkg.version + '.'); - }); -}; From 0b6f66ca81142c9c96b9fb6a6a71c02cc01ce93f Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 3 Aug 2013 00:27:36 +0200 Subject: [PATCH 09/14] A few alignement tweaks. --- Gruntfile.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index ce531b6c7..268a8826c 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -65,9 +65,9 @@ module.exports = (grunt) -> ] copy: crx: - src: 'img/*.png' + src: 'img/*.png' dest: 'builds/crx/' - expand: true + expand: true flatten: true # for_d19 # 19 juin 2013 10:32:22 @@ -76,20 +76,20 @@ module.exports = (grunt) -> # This solution is sub-optimal and will be changed in the future. # For now, upload an unsigned ZIP-file with the ending .nex or .crx. nex: - src: 'builds/<%= pkg.name %>.zip' + src: 'builds/<%= pkg.name %>.zip' dest: 'builds/<%= pkg.name %>.nex' coffee: script: - src: 'tmp-<%= pkg.type %>/script.coffee' + src: 'tmp-<%= pkg.type %>/script.coffee' dest: 'tmp-<%= pkg.type %>/script.js' concurrent: build: ['build-crx', 'build-userscript'] bump: options: updateConfigs: ['pkg'] - commit: false + commit: false createTag: false - push: false + push: false shell: commit: options: shellOptions @@ -98,7 +98,7 @@ module.exports = (grunt) -> 'git commit -am "Release <%= pkg.meta.name %> v<%= pkg.version %>."' 'git tag -a <%= pkg.version %> -m "<%= pkg.meta.name %> v<%= pkg.version %>."' 'git tag -af stable-v3 -m "<%= pkg.meta.name %> v<%= pkg.version %>."' - ].join(' && ') + ].join ' && ' push: options: shellOptions command: 'git push origin --tags -f && git push origin --all' @@ -123,7 +123,7 @@ module.exports = (grunt) -> archive: 'builds/<%= pkg.name %>.zip' level: 9 pretty: true - expand: true + expand: true flatten: true src: 'builds/crx/*' dest: '/' @@ -167,7 +167,7 @@ module.exports = (grunt) -> ] grunt.registerTask 'release', ['shell:commit', 'shell:push', 'build-crx', 'compress:crx', 'copy:nex'] - grunt.registerTask 'patch', ['bump', 'updcl:3', 'release'] + grunt.registerTask 'patch', ['bump', 'updcl:3', 'release'] grunt.registerTask 'minor', ['bump:minor', 'updcl:2', 'release'] grunt.registerTask 'major', ['bump:major', 'updcl:1', 'release'] From 82d3afba0adfa77ba2ad6bae77a561376360fd9a Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 3 Aug 2013 00:52:16 +0200 Subject: [PATCH 10/14] Tweak Gruntfile tasks loading. --- Gruntfile.coffee | 10 +--------- package.json | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 268a8826c..9410f0c6b 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -132,15 +132,7 @@ module.exports = (grunt) -> tmpcrx: 'tmp-crx' tmpuserscript: 'tmp-userscript' - grunt.loadNpmTasks 'grunt-bump' - grunt.loadNpmTasks 'grunt-concurrent' - grunt.loadNpmTasks 'grunt-contrib-clean' - grunt.loadNpmTasks 'grunt-contrib-coffee' - grunt.loadNpmTasks 'grunt-contrib-compress' - grunt.loadNpmTasks 'grunt-contrib-concat' - grunt.loadNpmTasks 'grunt-contrib-copy' - grunt.loadNpmTasks 'grunt-contrib-watch' - grunt.loadNpmTasks 'grunt-shell' + require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks grunt.registerTask 'default', ['build'] diff --git a/package.json b/package.json index b01920f2d..33b87d4d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "grunt-contrib-concat": "~0.3.0", "grunt-contrib-copy": "~0.4.1", "grunt-contrib-watch": "~0.5.0", - "grunt-shell": "~0.3.1" + "grunt-shell": "~0.3.1", + "matchdep": "~0.1.2" }, "repository": { "type": "git", From 68214969d8707f919b0b689ffb6924bd3a7c6b48 Mon Sep 17 00:00:00 2001 From: NemDiggers Date: Sat, 3 Aug 2013 01:04:38 -0400 Subject: [PATCH 11/14] I'm crazy I'm going to give it a shot. I've been archiving /b/ for awhile now and see nothing blatantly illegal. I'm hoping users will report anything van worthy. If shit hits the fan, I'll just submit another PR removing it. --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index b59fa5145..a5cee414f 100644 --- a/json/archives.json +++ b/json/archives.json @@ -59,8 +59,8 @@ "http": true, "https": false, "software": "foolfuuka", - "boards": ["e", "h", "hc", "p", "s", "u"], - "files": ["e", "h", "hc", "p", "s", "u"] + "boards": ["b" "e", "h", "hc", "p", "s", "u"], + "files": ["b" "e", "h", "hc", "p", "s", "u"] }, { "uid": 7, "name": "Install Gentoo", From fbebf6cbd376b09d2ac94d6b2c4bd720902c20cb Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 3 Aug 2013 18:05:53 +0200 Subject: [PATCH 12/14] Fix missing comma. @Proplex --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index a5cee414f..f0c788108 100644 --- a/json/archives.json +++ b/json/archives.json @@ -59,8 +59,8 @@ "http": true, "https": false, "software": "foolfuuka", - "boards": ["b" "e", "h", "hc", "p", "s", "u"], - "files": ["b" "e", "h", "hc", "p", "s", "u"] + "boards": ["b", "e", "h", "hc", "p", "s", "u"], + "files": ["b", "e", "h", "hc", "p", "s", "u"] }, { "uid": 7, "name": "Install Gentoo", From 8e79a53701e07064abd56882945df5902506fd91 Mon Sep 17 00:00:00 2001 From: Enzo Moretti Date: Sun, 4 Aug 2013 15:32:52 +0200 Subject: [PATCH 13/14] Adding Foolz Archive Beta as archive option. --- json/archives.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/json/archives.json b/json/archives.json index f0c788108..e83401a89 100644 --- a/json/archives.json +++ b/json/archives.json @@ -97,4 +97,13 @@ "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": 11, + "name": "Foolz Beta", + "domain": "beta.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"] }] From 6b0ba6f96e59eda8ce85c6d566c83c1a11b69a14 Mon Sep 17 00:00:00 2001 From: Enzo Moretti Date: Sun, 4 Aug 2013 16:00:12 +0200 Subject: [PATCH 14/14] Adding also /mlp/, /h/ and /u/, and fixing the unique id. --- json/archives.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json/archives.json b/json/archives.json index e83401a89..15c52e369 100644 --- a/json/archives.json +++ b/json/archives.json @@ -98,12 +98,12 @@ "boards": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"], "files": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "tg", "vr"] }, { - "uid": 11, + "uid": 13, "name": "Foolz Beta", "domain": "beta.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"] + "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"] }]