From 7e25c139879a9a2c945687b680dc34f70cda9164 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 18 May 2014 16:35:53 -0700 Subject: [PATCH] Support Chrome users on Windows. --- .gitignore | 1 - CHANGELOG.md | 3 +++ Gruntfile.coffee | 16 +++++++++++++++- README.md | 5 +---- src/General/meta/manifest-w.json | 24 ++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100755 src/General/meta/manifest-w.json diff --git a/.gitignore b/.gitignore index 33a9e31be..e962dde16 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ node_modules/ tmp-crx/ tmp-userscript/ testbuilds/ -builds/4chan-X.zip Gruntfile.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 449151384..ea672bc0f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +**ccd0** +- Support Chrome users on Windows. + ### v1.7.42 *2014-05-18* diff --git a/Gruntfile.coffee b/Gruntfile.coffee index ef2bccb5d..f1a579c44 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -55,6 +55,13 @@ module.exports = (grunt) -> 'src/General/meta/usestrict.js' 'tmp-<%= pkg.type %>/script.js' ] + 'testbuilds/wcrx/manifest.json': 'src/General/meta/manifest-w.json' + 'testbuilds/wcrx/script.js': [ + 'src/General/meta/botproc.js' + 'src/General/meta/banner.js' + 'src/General/meta/usestrict.js' + 'tmp-<%= pkg.type %>/script.js' + ] userscript: files: 'testbuilds/<%= pkg.name %>.meta.js': 'src/General/meta/metadata.js' @@ -72,6 +79,11 @@ module.exports = (grunt) -> dest: 'testbuilds/crx/' expand: true flatten: true + wcrx: + src: 'src/General/img/*.png' + dest: 'testbuilds/wcrx/' + expand: true + flatten: true builds: cwd: 'testbuilds/' src: '**' @@ -138,7 +150,7 @@ module.exports = (grunt) -> pretty: true expand: true flatten: true - src: 'testbuilds/crx/*' + src: 'testbuilds/wcrx/*' dest: '/' clean: @@ -183,6 +195,7 @@ module.exports = (grunt) -> 'coffee:script' 'concat:crx' 'copy:crx' + 'copy:wcrx' 'clean:tmpcrx' ] @@ -197,6 +210,7 @@ module.exports = (grunt) -> grunt.registerTask 'release', [ 'build' 'shell:pack' + 'compress:crx' 'concat:meta' 'copy:builds' 'shell:commit' diff --git a/README.md b/README.md index b3c8dd289..b7a7b7e67 100755 --- a/README.md +++ b/README.md @@ -8,10 +8,7 @@ https://github.com/Nebukazar/OneeChan ##[Install](https://ccd0.github.io/4chan-x/builds/4chan-X.user.js) (Firefox) Install [Greasemonkey](https://addons.mozilla.org/en-US/firefox/addon/greasemonkey/), then click the link above to install. ##[Install](https://ccd0.github.io/4chan-x/builds/crx.crx) (Chromium) -Download the file and add drag it to your chrome://extensions page. - +Download the file and add drag it to your chrome://extensions page. Chrome 35+ users on Windows may need to install it from [here](https://chrome.google.com/webstore/detail/4chan-x/ohnjgmpcibpbafdlkimncjhflgedgpam). ## If you have any problems, try resetting your 4chan X settings diff --git a/src/General/meta/manifest-w.json b/src/General/meta/manifest-w.json new file mode 100755 index 000000000..cb022ecea --- /dev/null +++ b/src/General/meta/manifest-w.json @@ -0,0 +1,24 @@ +{ + "name": "<%= meta.name %>", + "version": "<%= version %>", + "manifest_version": 2, + "description": "<%= description %>", + "icons": { + "16": "icon16.png", + "48": "icon48.png", + "128": "icon128.png" + }, + "content_scripts": [{ + "js": ["script.js"], + "matches": <%= JSON.stringify(meta.matches) %>, + "all_frames": true, + "run_at": "document_start" + }], + "homepage_url": "<%= meta.page %>", + "minimum_chrome_version": "<%= meta.min.chrome %>", + "permissions": [ + "storage", + "http://*/", + "https://*/" + ] +}