From 60603f3618a9e2d6e9b217efc034bd316df12584 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Sun, 27 Jul 2014 17:08:04 -0700 Subject: [PATCH] Fix #655 --- builds/appchan-x.meta.js | 2 ++ builds/appchan-x.user.js | 4 ++-- builds/crx/script.js | 2 -- package.json | 4 ++++ src/General/Main.coffee | 2 -- src/General/meta/metadata.js | 5 +++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js index d4f8f8bc2..4c0118393 100644 --- a/builds/appchan-x.meta.js +++ b/builds/appchan-x.meta.js @@ -11,6 +11,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @exclude *://blog.4chan.org/* +// @exclude *://dis.4chan.org/* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 02a494dd4..441a2962b 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -12,6 +12,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @exclude *://blog.4chan.org/* +// @exclude *://dis.4chan.org/* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue @@ -18079,8 +18081,6 @@ Main.setThemeString(); Main.setMascotString(); switch (location.hostname) { - case 'blog.4chan.org': - return; case '4chan.org': case 'www.4chan.org': g.TYPE = 'sfw'; diff --git a/builds/crx/script.js b/builds/crx/script.js index ec2310da4..386c74512 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -18090,8 +18090,6 @@ Main.setThemeString(); Main.setMascotString(); switch (location.hostname) { - case 'blog.4chan.org': - return; case '4chan.org': case 'www.4chan.org': g.TYPE = 'sfw'; diff --git a/package.json b/package.json index 6e3e2f2c5..005430072 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,10 @@ "*://a.4cdn.org/*", "*://i.4cdn.org/*" ], + "excludes": [ + "*://blog.4chan.org/*", + "*://dis.4chan.org/*" + ], "files": { "metajs": "appchan-x.meta.js", "userjs": "appchan-x.user.js" diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 290b237a6..007de86a4 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -73,8 +73,6 @@ Main = Main.setMascotString() switch location.hostname - when 'blog.4chan.org' - return when '4chan.org', 'www.4chan.org' g.TYPE = 'sfw' g.VIEW = 'home' diff --git a/src/General/meta/metadata.js b/src/General/meta/metadata.js index 76b0a611d..e0409e26f 100755 --- a/src/General/meta/metadata.js +++ b/src/General/meta/metadata.js @@ -11,6 +11,11 @@ return '// @match ' + match; }).join('\n') %> +<%= + meta.excludes.map(function(exclude) { + return '// @exclude ' + exclude; + }).join('\n') +%> // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue