From 6a9e334c023eb4e60edefed892b6b5b35e638bf7 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Wed, 8 May 2013 06:14:22 -0700 Subject: [PATCH 1/2] Generated by CS --- Gruntfile.coffee | 3 +++ builds/4chan-X.js | 1 + builds/4chan-X.user.js | 1 + builds/crx/script.js | 1 + src/General/meta/botproc.js | 1 + 5 files changed, 7 insertions(+) create mode 100644 src/General/meta/botproc.js diff --git a/Gruntfile.coffee b/Gruntfile.coffee index e3ccf3961..3ee3644a2 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -49,6 +49,7 @@ module.exports = (grunt) -> files: 'builds/crx/manifest.json': 'src/General/meta/manifest.json' 'builds/crx/script.js': [ + 'src/General/meta/botproc.js' 'src/General/meta/banner.js' 'tmp-<%= pkg.type %>/script.js' ] @@ -56,6 +57,7 @@ module.exports = (grunt) -> userjs: options: concatOptions src: [ + 'src/General/meta/botproc.js' 'src/General/meta/metadata.js' 'src/General/meta/banner.js' 'tmp-<%= pkg.type %>/script.js' @@ -67,6 +69,7 @@ module.exports = (grunt) -> files: 'builds/<%= pkg.name %>.meta.js': 'src/General/meta/metadata.js' 'builds/<%= pkg.name %>.user.js': [ + 'src/General/meta/botproc.js' 'src/General/meta/metadata.js' 'src/General/meta/banner.js' 'tmp-<%= pkg.type %>/script.js' diff --git a/builds/4chan-X.js b/builds/4chan-X.js index bb1273afc..741cec7dc 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -1,3 +1,4 @@ +// Generated by CoffeeScript // ==UserScript== // @name 4chan X // @version 1.1.16 diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 44c00eacb..2b2b05283 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,3 +1,4 @@ +// Generated by CoffeeScript // ==UserScript== // @name 4chan X // @version 1.1.16 diff --git a/builds/crx/script.js b/builds/crx/script.js index 2d158682a..6344c5028 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,3 +1,4 @@ +// Generated by CoffeeScript /* * 4chan X - Version 1.1.16 - 2013-05-08 * diff --git a/src/General/meta/botproc.js b/src/General/meta/botproc.js new file mode 100644 index 000000000..f1f5b52c2 --- /dev/null +++ b/src/General/meta/botproc.js @@ -0,0 +1 @@ +// Generated by CoffeeScript \ No newline at end of file From afb1001cbb8a76a1fe2d591c75d402612aa7a308 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Thu, 9 May 2013 01:17:09 -0700 Subject: [PATCH 2/2] Fix stubs menu not following stubs config (firefox only?) --- LICENSE | 2 +- builds/4chan-X.js | 8 ++++---- builds/4chan-X.user.js | 8 ++++---- builds/crx/script.js | 8 ++++---- src/Filtering/PostHiding.coffee | 4 ++-- src/Filtering/ThreadHiding.coffee | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index 454797bba..56ae88ded 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.1.16 - 2013-05-08 +* 4chan X - Version 1.1.16 - 2013-05-09 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 741cec7dc..106668334 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.1.16 - 2013-05-08 +* 4chan X - Version 1.1.16 - 2013-05-09 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -2987,10 +2987,10 @@ innerHTML: ' This post' }); replies = $.el('label', { - innerHTML: " Hide replies" + innerHTML: " Hide replies" }); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); $.event('AddMenuEntry', { type: 'post', @@ -3376,7 +3376,7 @@ }); $.on(apply, 'click', ThreadHiding.menu.hide); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); return $.event('AddMenuEntry', { type: 'post', diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 2b2b05283..24a82ff43 100644 --- 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.1.16 - 2013-05-08 +* 4chan X - Version 1.1.16 - 2013-05-09 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -2983,10 +2983,10 @@ innerHTML: ' This post' }); replies = $.el('label', { - innerHTML: " Hide replies" + innerHTML: " Hide replies" }); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); $.event('AddMenuEntry', { type: 'post', @@ -3372,7 +3372,7 @@ }); $.on(apply, 'click', ThreadHiding.menu.hide); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); return $.event('AddMenuEntry', { type: 'post', diff --git a/builds/crx/script.js b/builds/crx/script.js index 6344c5028..210f4c352 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.1.16 - 2013-05-08 +* 4chan X - Version 1.1.16 - 2013-05-09 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -2986,10 +2986,10 @@ innerHTML: ' This post' }); replies = $.el('label', { - innerHTML: " Hide replies" + innerHTML: " Hide replies" }); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); $.event('AddMenuEntry', { type: 'post', @@ -3375,7 +3375,7 @@ }); $.on(apply, 'click', ThreadHiding.menu.hide); makeStub = $.el('label', { - innerHTML: " Make stub" + innerHTML: " Make stub" }); return $.event('AddMenuEntry', { type: 'post', diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee index 14a6635ea..ad2899b69 100644 --- a/src/Filtering/PostHiding.coffee +++ b/src/Filtering/PostHiding.coffee @@ -35,9 +35,9 @@ PostHiding = thisPost = $.el 'label', innerHTML: ' This post' replies = $.el 'label', - innerHTML: " Hide replies" + innerHTML: " Hide replies" makeStub = $.el 'label', - innerHTML: " Make stub" + innerHTML: " Make stub" $.event 'AddMenuEntry', type: 'post' diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee index f237cecf7..2ae4b47b0 100644 --- a/src/Filtering/ThreadHiding.coffee +++ b/src/Filtering/ThreadHiding.coffee @@ -69,7 +69,7 @@ ThreadHiding = $.on apply, 'click', ThreadHiding.menu.hide makeStub = $.el 'label', - innerHTML: " Make stub" + innerHTML: " Make stub" $.event 'AddMenuEntry', type: 'post'