From 23f944336fda3487bacf6eda5b133ad57f701c55 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Thu, 22 Dec 2011 16:29:09 -0800 Subject: [PATCH 01/63] Adding pretty things --- bg.html | 2 ++ dialog.js | 10 ++++++---- manifest.json | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bg.html b/bg.html index d8dbb2d..4c28d6d 100644 --- a/bg.html +++ b/bg.html @@ -2,6 +2,8 @@ + + + + \ No newline at end of file diff --git a/domains.js b/domains.js new file mode 100644 index 0000000..042c1b5 --- /dev/null +++ b/domains.js @@ -0,0 +1,277 @@ +// http://venturebeat.com/2011/12/22/list-of-sopa-supporters/ +// https://docs.google.com/document/d/1xjisu18X6s7lPtAsIQg5Ol3KJjymPT2az1kasQVwGiw/edit?pli=1 +// http://www.techdirt.com/articles/20111223/09051617180/law-firms-removing-their-name-sopa-supporters-list-sopa-support-crumbling.shtml + +var domains = [ + '60plus.org', + 'abc.com', + 'go.com', + 'safeonlinerx.com', + 'afm.org', + 'aftra.org', + 'ascap.com', + 'atr.org', + 'publishers.org', + 'ascia.org', + 'agentassociation.com', + 'bakerlaw.com', + 'beachbody.com', + 'bmi.com', + 'bmg.com', + 'bctd.org', + 'capitolnashville.com', + 'cbs.com', + 'cengage.com', + 'cmta.com', + 'cmpamusic.org', + 'caovp.com', + 'comcast.com', + 'comcast.net', + 'cwfa.org', + 'cfsi.org', + 'copyhype.com', + 'copyrightalliance.org', + 'coty.com', + 'bbb.org', + 'csg.org', + 'cmaworld.com', + 'cmt.com', + 'cov.com', + 'cdas.com', + 'cli.com', + 'creativeamerica.org', + 'dwt.com', + 'deluxe.com', + 'dga.org', + 'elsevier.com', + 'emicmg.com', + 'emimusicpub.com', + 'espn.com', + 'esteelauder.com', + 'elcompanies.com', + 'fop.net', + 'gospelmusic.org', + 'graphicartistsguild.org', + 'hachettebookgroup.com', + 'harpercollins.com', + 'hyperionbooks.com', + 'ifta-online.org', + 'iatse-intl.org', + 'iacc.org', + 'ibew.org', + 'teamster.org', + 'inta.org', + 'iupa.org', + 'irell.com', + 'jenner.com', + 'kelleydrye.com', + 'kbkfirm.com', + 'kwikalaw.com', + 'loreal.com', + 'lathropgage.com', + 'loeb.com', + 'losthighwayrecords.com', + 'macmillan.com', + 'mcsheriffs.com', + 'mlb.com', + 'marvel.com', + 'mastercard.com', + 'interscope.com', + 'mheducation.com', + 'umgnashville.com', + 'minorleaguebaseball.com', + 'mmtconline.org', + 'msk.com', + 'mofo.com', + 'mpaa.org', + 'iatse-intl.org', + 'magazine.org', + 'nam.org', + 'napc.us', + 'nascio.org', + 'ncta.com', + 'ncvc.org', + 'ndaa.org', + 'ndpci.us', + 'nfl.com', + 'nga.org', + 'nlc.org', + 'natlnarc.org', + 'sheriffs.org', + 'nashvillesongwriters.com', + 'ntctroopers.com', + 'newscorp.com', + 'newyorkpost.com', + 'foxnews.com', + 'pbwt.com', + 'pearsoned.com', + 'prenhall.com', + 'penguingroup.com', + 'penguin.com', + 'phrma.org', + 'phillipsnizer.com', + 'pfizer.com', + 'proskauer.com', + 'providentdistribution.com', + 'randomhouse.com', + 'raulet.com', + 'revlon.com', + 'godaddy.com', + 'rkmc.com', + 'scholastic.com', + 'sag.org', + 'shearman.com', + 'sdumusic.com', + 'stblaw.com', + 'skadden.com', + 'sonyatv.com', + 'sonymusic.com', + 'sonymusicnashville.com', + 'sidoamerica.org', + 'natoonline.org', + 'perseusbooks.com', + 'usmayors.org', + 'tiffany.com', + 'timewarnercable.com', + 'ufc.com', + 'uschamber.com', + 'usta.com', + 'universalmusic.com', + 'umusicpub.com', + 'viacom.com', + 'mtv.com', + 'visa.com', + 'wwnorton.com', + 'wmg.com', + 'warnermusicnashville.com', + 'whitecase.com', + 'wkhealth.com', + 'wordentertainment.com', + '1800contacts.com', + '1800petmeds.com', + '3m.com', + 'abro.com', + 'acushnetcompany.com', + 'adidas.com', + 'astrazeneca-us.com', + 'autodesk.com', + 'bose.com', + 'burberry.com', + 'adobe.com', + 'apple.com', + 'aveva.com', + 'avg.com', + 'bentley.com', + 'cadence.com', + 'mastercam.com', + 'compuware.com', + '3ds.com', + 'dell.com', + 'intel.com', + 'intuit.com', + 'mcaffe.com', + 'microsoft.com', + 'minitab.com', + 'progress.com', + 'ptc.com', + 'quark.com', + 'quest.com', + 'siemens.com', + 'sybase.com', + 'symantec.com', + 'techsmith.com', + 'mathworks.com', + 'callawaygolf.com', + 'cat.com', + 'cbscorporation.com', + 'chanel.com', + 'coach.com', + 'dolby.com', + 'columbia.com', + 'dolcegabbana.com', + 'ea.com', + 'fender.com', + 'ford.com', + 'harley-davidson.com', + 'jnj.com', + 'juicycouture.com', + 'katespade.com', + 'lacoste.com', + 'leatherman.com', + 'lexmark.com', + 'lizclaiborneinc.com', + 'lorealusa.com', + 'luckybrand.com', + 'marmot.com', + 'monstercable.com', + 'nba.com', + 'nbcuni.com', + 'edhardyshop.com', + 'newbalance.com', + 'neweracap.com', + 'nhl.com', + 'nikeinc.com', + 'nike.com', + 'nintendo.com', + 'oakley.com', + 'peavey.com', + 'perryellis.com', + 'pga.com', + 'philipmorrisusa.com', + 'ping.com', + 'ralphlauren.com', + 'redwingshoes.com', + 'reebok.com', + 'riteaid.com', + 'rolex.com', + 'rosettastone.com', + 'shure.com', + 'sony.com', + 'spyder.com', + 'taylorguitars.com', + 'taylormadegolf.com', + 'dow.com', + 'timberland.com', + 'timewarner.com', + 'toshiba.com', + 'walmartstores.com', + 'walmart.com', + 'wmg.com', + 'riaa.com', + 'wwe.com', + 'xerox.com', + 'zippo.com', + 'instructables.com', + //below are companies owned by viacom + 'xfire.com', + 'addictinggames.com', + 'shockwave.com', + 'atom.com', + 'bet.com', + 'cmt.com', + 'comedycentral.com', + 'gametrailers.com', + 'harmonixmusic.com', + 'spike.com', + 'logotv.com', + 'AfterEllen.com', + 'AfterElton.com', + '365gay.com', + 'parentsconnect.com', + 'mtv.com', + 'mtvndigital.com', + 'mtvncareers.com', + 'mtvu.com', + 'ratemyprofessors.com', + 'collegepublisher.com', + 'neopets.com', + 'nickatnite.com', + 'nickjr.com', + 'nick.com', + 'teennick.com', + 'vh1.com', + 'vmtv.com', + 'paramount.com', + 'dreamworks.com' +]; + From 300217e86ccb98c8079f840df577c9691537739c Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Sat, 24 Dec 2011 14:30:25 -0600 Subject: [PATCH 33/63] Removed unnecessary file dependencies --- bg.html | 1 - domains.csv | 273 ---------------------------------------------------- godaddy.js | 25 ----- jquery.js | 4 - 4 files changed, 303 deletions(-) delete mode 100644 domains.csv delete mode 100644 godaddy.js delete mode 100644 jquery.js diff --git a/bg.html b/bg.html index 0a702a5..36a4a45 100644 --- a/bg.html +++ b/bg.html @@ -1,6 +1,5 @@ - - + - - + if (!document.getElementById('stopSOPA')) { + var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; + document.body.innerHTML = content + document.body.innerHTML; + } +}); - - \ No newline at end of file + diff --git a/sopa.js b/sopa.js deleted file mode 100644 index b62e498..0000000 --- a/sopa.js +++ /dev/null @@ -1,5 +0,0 @@ -if (!document.getElementById('stopSOPA')) { - var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; - - document.body.innerHTML = content + document.body.innerHTML; -} \ No newline at end of file From 450cca860138955ec315fba67188685867115ff2 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 28 Dec 2011 16:59:40 -0600 Subject: [PATCH 40/63] Now with less suck. --- bg.html | 27 ++++++++------------------- sopa.js | 4 ++++ 2 files changed, 12 insertions(+), 19 deletions(-) create mode 100644 sopa.js diff --git a/bg.html b/bg.html index 10be43d..187371c 100644 --- a/bg.html +++ b/bg.html @@ -1,27 +1,16 @@ - - - + + diff --git a/sopa.js b/sopa.js new file mode 100644 index 0000000..f3d30ff --- /dev/null +++ b/sopa.js @@ -0,0 +1,4 @@ +if (!document.getElementById('stopSOPA')) { + var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; + document.body.innerHTML = content + document.body.innerHTML; +} From 254df0d30fa7b478b913b3d93162a78f3ffb4c66 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 30 Dec 2011 00:13:30 -0500 Subject: [PATCH 41/63] Update manifest.json version number for new release --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index ad7f553..31dccee 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "No SOPA", - "version": "1.7", + "version": "1.8", "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", "permissions": [ From 2b607ce0f3b4630a7ced2941727c636423609690 Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Thu, 29 Dec 2011 23:30:53 -0600 Subject: [PATCH 42/63] Fixing styling --- sopa.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopa.js b/sopa.js index f3d30ff..5dc0e13 100644 --- a/sopa.js +++ b/sopa.js @@ -1,4 +1,4 @@ if (!document.getElementById('stopSOPA')) { - var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; + var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; document.body.innerHTML = content + document.body.innerHTML; } From eff85451c878aca09af3baf37305a17e01c3fd4b Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Thu, 29 Dec 2011 22:40:45 -0800 Subject: [PATCH 43/63] Adding BSA #14 --- domains.js | 1 + 1 file changed, 1 insertion(+) diff --git a/domains.js b/domains.js index da3ef77..4193ae0 100644 --- a/domains.js +++ b/domains.js @@ -19,6 +19,7 @@ var domains = [ 'bmi.com', 'bmg.com', 'bctd.org', + 'bsa.org', 'capitolnashville.com', 'cbs.com', 'cengage.com', From 04452f0e5ae348e6de52044046497b282bbc3846 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Wed, 4 Jan 2012 10:42:22 -0800 Subject: [PATCH 44/63] Add riaa.org, thanks @aral --- domains.js | 1 + 1 file changed, 1 insertion(+) diff --git a/domains.js b/domains.js index 4193ae0..91788a9 100644 --- a/domains.js +++ b/domains.js @@ -238,6 +238,7 @@ var domains = [ 'walmart.com', 'wmg.com', 'riaa.com', + 'riaa.org', 'wwe.com', 'xerox.com', 'zippo.com', From 9e0ce03cbbb06b32581655d02bcc36733a68cc3f Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Wed, 4 Jan 2012 19:52:37 -0800 Subject: [PATCH 45/63] Updating version number for new release --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 31dccee..3607d9f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "No SOPA", - "version": "1.8", + "version": "1.9", "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", "permissions": [ From 892d9cd6a847212e085ef4dd1ea1485a67fca13d Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Wed, 4 Jan 2012 19:55:10 -0800 Subject: [PATCH 46/63] Updating copy to reflect SOPA and PIPA; "Internet Blacklist Legislation" term came from EFF: https://www.eff.org/issues/coica-internet-censorship-and-copyright-bill --- sopa.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopa.js b/sopa.js index 5dc0e13..a2a2434 100644 --- a/sopa.js +++ b/sopa.js @@ -1,4 +1,4 @@ if (!document.getElementById('stopSOPA')) { - var content = "
SOPA Supporter! This company is a known supporter of the dangerous ‘Stop Online Piracy Act.’
"; + var content = "
Internet Blacklist Legislation Supporter! This company is a known supporter of the dangerous SOPA or PIPA legislation.
"; document.body.innerHTML = content + document.body.innerHTML; } From e26a99414ac2f7c85ad4c8028425a76c7981771c Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 6 Jan 2012 11:09:42 -0800 Subject: [PATCH 47/63] Update domains.js --- domains.js | 242 ++++------------------------------------------------- 1 file changed, 15 insertions(+), 227 deletions(-) diff --git a/domains.js b/domains.js index 91788a9..07428ee 100644 --- a/domains.js +++ b/domains.js @@ -1,12 +1,9 @@ -// http://venturebeat.com/2011/12/22/list-of-sopa-supporters/ -// https://docs.google.com/document/d/1xjisu18X6s7lPtAsIQg5Ol3KJjymPT2az1kasQVwGiw/edit?pli=1 -// http://www.techdirt.com/articles/20111223/09051617180/law-firms-removing-their-name-sopa-supporters-list-sopa-support-crumbling.shtml - var domains = [ '60plus.org', 'abc.com', 'go.com', 'safeonlinerx.com', + 'aba.com', 'afm.org', 'aftra.org', 'ascap.com', @@ -14,20 +11,20 @@ var domains = [ 'publishers.org', 'ascia.org', 'agentassociation.com', - 'bakerlaw.com', 'beachbody.com', 'bmi.com', 'bmg.com', 'bctd.org', - 'bsa.org', 'capitolnashville.com', 'cbs.com', 'cengage.com', + 'cfif.org', 'cmta.com', 'cmpamusic.org', 'caovp.com', 'comcast.com', 'comcast.net', + 'nbc.com', 'cwfa.org', 'cfsi.org', 'copyhype.com', @@ -37,16 +34,15 @@ var domains = [ 'csg.org', 'cmaworld.com', 'cmt.com', - 'cov.com', - 'cdas.com', - 'cli.com', 'creativeamerica.org', 'deluxe.com', 'dga.org', 'elsevier.com', + 'elsevierdirect.com', 'emicmg.com', 'emimusicpub.com', 'espn.com', + 'theesa.com', 'esteelauder.com', 'elcompanies.com', 'fop.net', @@ -62,18 +58,13 @@ var domains = [ 'teamster.org', 'inta.org', 'iupa.org', - 'irell.com', - 'jenner.com', - 'kelleydrye.com', - 'kbkfirm.com', - 'kwikalaw.com', 'loreal.com', - 'lathropgage.com', - 'loeb.com', + 'letfreedomringusa.com', 'losthighwayrecords.com', 'macmillan.com', 'mcsheriffs.com', 'mlb.com', + 'majorcitieschiefs.org', 'marvel.com', 'mastercard.com', 'interscope.com', @@ -81,21 +72,19 @@ var domains = [ 'umgnashville.com', 'minorleaguebaseball.com', 'mmtconline.org', - 'msk.com', - 'mofo.com', 'mpaa.org', - 'iatse-intl.org', 'magazine.org', 'nam.org', 'napc.us', + 'napcsite.org', 'nascio.org', 'ncta.com', 'ncvc.org', + 'ncja.org', 'ndaa.org', 'ndpci.us', 'nfl.com', 'nga.org', - 'nlc.org', 'natlnarc.org', 'sheriffs.org', 'nashvillesongwriters.com', @@ -103,29 +92,19 @@ var domains = [ 'newscorp.com', 'newyorkpost.com', 'foxnews.com', - 'pbwt.com', 'pearsoned.com', - 'prenhall.com', - 'penguingroup.com', 'penguin.com', 'phrma.org', - 'phillipsnizer.com', 'pfizer.com', - 'proskauer.com', 'providentdistribution.com', 'randomhouse.com', 'raulet.com', 'revlon.com', - 'godaddy.com', - 'rkmc.com', 'scholastic.com', 'sag.org', - 'shearman.com', 'sdumusic.com', - 'stblaw.com', - 'skadden.com', - 'sonyatv.com', 'sonymusic.com', + 'sonyatv.com', 'sonymusicnashville.com', 'sidoamerica.org', 'natoonline.org', @@ -133,8 +112,10 @@ var domains = [ 'usmayors.org', 'tiffany.com', 'timewarnercable.com', + 'truereligionbrandjeans.com', 'ufc.com', 'uschamber.com', + 'teamusa.org', 'usta.com', 'universalmusic.com', 'umusicpub.com', @@ -142,201 +123,8 @@ var domains = [ 'mtv.com', 'visa.com', 'wwnorton.com', - 'wmg.com', + 'wallacebajjali.com', 'warnermusicnashville.com', - 'whitecase.com', 'wkhealth.com', - 'wordentertainment.com', - '1800contacts.com', - '1800petmeds.com', - '3m.com', - 'abro.com', - 'acushnetcompany.com', - 'adidas.com', - 'astrazeneca-us.com', - 'autodesk.com', - 'bose.com', - 'burberry.com', - 'adobe.com', - 'apple.com', - 'aveva.com', - 'avg.com', - 'bentley.com', - 'cadence.com', - 'mastercam.com', - 'compuware.com', - '3ds.com', - 'dell.com', - 'intel.com', - 'intuit.com', - 'mcaffe.com', - 'microsoft.com', - 'minitab.com', - 'progress.com', - 'ptc.com', - 'quark.com', - 'quest.com', - 'siemens.com', - 'sybase.com', - 'symantec.com', - 'techsmith.com', - 'mathworks.com', - 'callawaygolf.com', - 'cat.com', - 'cbscorporation.com', - 'chanel.com', - 'coach.com', - 'dolby.com', - 'columbia.com', - 'dolcegabbana.com', - 'ea.com', - 'fender.com', - 'ford.com', - 'harley-davidson.com', - 'jnj.com', - 'juicycouture.com', - 'katespade.com', - 'lacoste.com', - 'leatherman.com', - 'lexmark.com', - 'lizclaiborneinc.com', - 'lorealusa.com', - 'luckybrand.com', - 'marmot.com', - 'monstercable.com', - 'nba.com', - 'nbcuni.com', - 'edhardyshop.com', - 'newbalance.com', - 'neweracap.com', - 'nhl.com', - 'nikeinc.com', - 'nike.com', - 'nintendo.com', - 'oakley.com', - 'peavey.com', - 'perryellis.com', - 'pga.com', - 'philipmorrisusa.com', - 'ping.com', - 'ralphlauren.com', - 'redwingshoes.com', - 'reebok.com', - 'riteaid.com', - 'rolex.com', - 'rosettastone.com', - 'shure.com', - 'sony.com', - 'spyder.com', - 'taylorguitars.com', - 'taylormadegolf.com', - 'dow.com', - 'timberland.com', - 'timewarner.com', - 'toshiba.com', - 'walmartstores.com', - 'walmart.com', - 'wmg.com', - 'riaa.com', - 'riaa.org', - 'wwe.com', - 'xerox.com', - 'zippo.com', - 'instructables.com', - //below are companies owned by viacom - 'xfire.com', - 'addictinggames.com', - 'shockwave.com', - 'atom.com', - 'bet.com', - 'cmt.com', - 'comedycentral.com', - 'gametrailers.com', - 'harmonixmusic.com', - 'spike.com', - 'logotv.com', - 'AfterEllen.com', - 'AfterElton.com', - '365gay.com', - 'parentsconnect.com', - 'mtv.com', - 'mtvndigital.com', - 'mtvncareers.com', - 'mtvu.com', - 'ratemyprofessors.com', - 'collegepublisher.com', - 'neopets.com', - 'nickatnite.com', - 'nickjr.com', - 'nick.com', - 'teennick.com', - 'vh1.com', - 'vmtv.com', - 'paramount.com', - 'dreamworks.com', - // below are companies owned by newscorp aka fox - 'foxmovies.com', - 'foxstudios.com', - 'fox.com', - 'foxconnect.com', - 'foxsearchlight.com', - 'newscorp.com', - 'foxcareers.com', - 'blueskystudios.com', - 'foxstudiosaustralia.com', - 'shinegroup.tv', - '20thtv.com', - 'foxtel.com.au', - 'foxsports.com', - 'foxsportsradio.com', - 'myfoxchicago.com', - 'lnt.lv', - 'startv.com', - 'startv.in', - 'startv.com.tr', - 'btn.com', - 'btn2go.com', - 'foxbusiness.com', - 'fuel.tv', - 'fxnetworks.com', - 'foxreality.com', - 'nationalgeographic.com', - 'speedtv.com', - 'foxsportssouth.com', - 'laptv.com', - 'sky.com', - 'sky.de', - 'sky.it', - 'skytv.co.nz', - 'AmericanIdol.com', - 'AskMen.com', - 'gamespy.com', - 'hulu.com', - 'ign.com', - 'scout.com', - 'mynetworktv.com', - 'whatifsports.com', - 'newsdigitalmedia.com.au', - 'authonomy.com', - 'myspace.com', - 'thesun.co.uk', - 'thetimes.co.uk', - 'thesundaytimes.co.uk', - 'news.com.au', - 'theaustralian.com.au', - 'aap.com.au', - 'telegraph.co.uk', - 'mxnet.com.au', - 'heraldsun.com.au', - 'couriermail.com.au', - 'brisbanenews.com.au', - 'themercury.com.au', - 'ntnews.com.au', - 'nypost.com', - 'wsj.com', - 'marketwatch.com', - 'efinancialnews.com', - 'harpercollins.com', - 'foxmusic.com' -]; - + 'wordentertainment.com' +]; \ No newline at end of file From 39477b658aeb285eb55d9882d592ab131c8f1713 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 6 Jan 2012 11:10:58 -0800 Subject: [PATCH 48/63] Update domains.js --- domains.js | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/domains.js b/domains.js index 07428ee..a5244fd 100644 --- a/domains.js +++ b/domains.js @@ -126,5 +126,100 @@ var domains = [ 'wallacebajjali.com', 'warnermusicnashville.com', 'wkhealth.com', - 'wordentertainment.com' + 'wordentertainment.com', + // Viacom + 'xfire.com', + 'addictinggames.com', + 'shockwave.com', + 'atom.com', + 'bet.com', + 'cmt.com', + 'comedycentral.com', + 'gametrailers.com', + 'harmonixmusic.com', + 'spike.com', + 'logotv.com', + 'AfterEllen.com', + 'AfterElton.com', + '365gay.com', + 'parentsconnect.com', + 'mtv.com', + 'mtvndigital.com', + 'mtvncareers.com', + 'mtvu.com', + 'ratemyprofessors.com', + 'collegepublisher.com', + 'neopets.com', + 'nickatnite.com', + 'nickjr.com', + 'nick.com', + 'teennick.com', + 'vh1.com', + 'vmtv.com', + 'paramount.com', + 'dreamworks.com', + // News Corp + 'foxmovies.com', + 'foxstudios.com', + 'fox.com', + 'foxconnect.com', + 'foxsearchlight.com', + 'newscorp.com', + 'foxcareers.com', + 'blueskystudios.com', + 'foxstudiosaustralia.com', + 'shinegroup.tv', + '20thtv.com', + 'foxtel.com.au', + 'foxsports.com', + 'foxsportsradio.com', + 'myfoxchicago.com', + 'lnt.lv', + 'startv.com', + 'startv.in', + 'startv.com.tr', + 'btn.com', + 'btn2go.com', + 'foxbusiness.com', + 'fuel.tv', + 'fxnetworks.com', + 'foxreality.com', + 'nationalgeographic.com', + 'speedtv.com', + 'foxsportssouth.com', + 'laptv.com', + 'sky.com', + 'sky.de', + 'sky.it', + 'skytv.co.nz', + 'AmericanIdol.com', + 'AskMen.com', + 'gamespy.com', + 'hulu.com', + 'ign.com', + 'scout.com', + 'mynetworktv.com', + 'whatifsports.com', + 'newsdigitalmedia.com.au', + 'authonomy.com', + 'myspace.com', + 'thesun.co.uk', + 'thetimes.co.uk', + 'thesundaytimes.co.uk', + 'news.com.au', + 'theaustralian.com.au', + 'aap.com.au', + 'telegraph.co.uk', + 'mxnet.com.au', + 'heraldsun.com.au', + 'couriermail.com.au', + 'brisbanenews.com.au', + 'themercury.com.au', + 'ntnews.com.au', + 'nypost.com', + 'wsj.com', + 'marketwatch.com', + 'efinancialnews.com', + 'harpercollins.com', + 'foxmusic.com' ]; \ No newline at end of file From 8278757a6b9bdda3ba37e90a56bd30e16054d72f Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 6 Jan 2012 11:13:31 -0800 Subject: [PATCH 49/63] Update domains.js --- domains.js | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/domains.js b/domains.js index a5244fd..1fb44c5 100644 --- a/domains.js +++ b/domains.js @@ -221,5 +221,30 @@ var domains = [ 'marketwatch.com', 'efinancialnews.com', 'harpercollins.com', - 'foxmusic.com' + 'foxmusic.com', + // IGN + '1up.com', + 'ugo.com', + 'teamxbox.com', + 'gamestats.com', + 'gamespy.com', + 'fileplanet.com', + 'askmen.com', + // CBS Interactive + 'gamespot.com', + 'cnet.com', + 'metacritic.com', + 'last.fm', + 'cbsnews.com', + 'techrepublic.com', + 'clicker.com', + 'tv.com', + 'radio.com', + 'search.com', + 'chow.com', + 'cbssports.com', + 'findarticles.com', + 'maxpreps.com', + 'mp3.com', + 'mysimon.com' ]; \ No newline at end of file From 0521ac6767602f9c1c0ef75b986cccb4f36b5690 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 6 Jan 2012 11:22:57 -0800 Subject: [PATCH 50/63] Update domains.js --- domains.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/domains.js b/domains.js index 1fb44c5..b57eca0 100644 --- a/domains.js +++ b/domains.js @@ -46,6 +46,7 @@ var domains = [ 'esteelauder.com', 'elcompanies.com', 'fop.net', + 'godaddy.com', 'gospelmusic.org', 'graphicartistsguild.org', 'hachettebookgroup.com', @@ -127,6 +128,11 @@ var domains = [ 'warnermusicnashville.com', 'wkhealth.com', 'wordentertainment.com', + // GoDaddy + 'godaddy.com', + 'wildwestdomains.com', + 'bluerazor.com', + 'starfieldtech.com', // Viacom 'xfire.com', 'addictinggames.com', @@ -139,8 +145,8 @@ var domains = [ 'harmonixmusic.com', 'spike.com', 'logotv.com', - 'AfterEllen.com', - 'AfterElton.com', + 'afterellen.com', + 'afterelton.com', '365gay.com', 'parentsconnect.com', 'mtv.com', @@ -192,8 +198,8 @@ var domains = [ 'sky.de', 'sky.it', 'skytv.co.nz', - 'AmericanIdol.com', - 'AskMen.com', + 'americanidol.com', + 'askmen.com', 'gamespy.com', 'hulu.com', 'ign.com', @@ -246,5 +252,5 @@ var domains = [ 'findarticles.com', 'maxpreps.com', 'mp3.com', - 'mysimon.com' + 'mysimon.com', ]; \ No newline at end of file From 48c6da20c5098b4f8ca2c9f5aa1238291b4b378b Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Fri, 6 Jan 2012 17:33:25 -0800 Subject: [PATCH 51/63] Update domains.js --- domains.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/domains.js b/domains.js index b57eca0..cd7743c 100644 --- a/domains.js +++ b/domains.js @@ -253,4 +253,59 @@ var domains = [ 'maxpreps.com', 'mp3.com', 'mysimon.com', + // List of PIPA supporters per OpenCongress + 'riaa.org', + 'riaa.com', + 'ifta-online.org', + 'natoonline.org', + 'microsoft.com', + 'pfizer.com', + 'outdoorindustry.org', + 'nema.org', + 'bsa.org', + 'ford.com', + 'aftermarket.org', + 'ul.com', + 'afm.org', + 'theesa.com', + 'a2im.org', + 'lilly.com', + 'xerox.com', + 'sbecouncil.org', + 'autoalliance.org', + 'mlb.com', + 'cbs.com', + 'nba.com', + 'advamed.org', + 'beamglobal.com', + 'nfl.com', + 'jnj.com', + 'greetingcard.org', + 'adidas.com', + 'acushnetcompany.com', + 'abro.com', + '1800petmeds.com', + '1800contacts.com', + 'blueskystudios.com', + 'bose.com', + 'bmi.com', + 'burberry.com', + 'eciaonline.org', + 'harpercollins.com', + 'kekepana.com', + 'lvmh.com', + 'louisvuitton.com', + 'nike.com', + 'nintendo.com', + 'taylormadegolf.com', + 'timberland.com', + 'tiffany.com', + 'comcast.com', + 'walmart.com', + 'aflcio.org', + 'merck.com', + 'ndaa.org', + 'ncja.org', + 'csg.org', + 'uschamber.com' ]; \ No newline at end of file From 51ff4128231f17e0b04575f8f51cd66a64d84968 Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Mon, 9 Jan 2012 10:12:07 -0600 Subject: [PATCH 52/63] Fix for issue #24 --- bg.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg.html b/bg.html index 187371c..15ee988 100644 --- a/bg.html +++ b/bg.html @@ -9,7 +9,7 @@ var host = tab.url.match(urlRegex)[6].split('.').splice(-2).join('.'); if (domains.indexOf(host) !== -1) { - chrome.tabs.executeScript(null, { file: 'sopa.js' }); + chrome.tabs.executeScript(tabId, { file: 'sopa.js' }); } }); From bcb8bfcfbe27bc7919b41242c1b936173baaae38 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Mon, 9 Jan 2012 16:27:01 -0800 Subject: [PATCH 53/63] Update wording and increase version number for new release --- manifest.json | 2 +- sopa.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 3607d9f..2395635 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "No SOPA", - "version": "1.9", + "version": "1.10", "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", "permissions": [ diff --git a/sopa.js b/sopa.js index a2a2434..485b514 100644 --- a/sopa.js +++ b/sopa.js @@ -1,4 +1,4 @@ if (!document.getElementById('stopSOPA')) { - var content = "
Internet Blacklist Legislation Supporter! This company is a known supporter of the dangerous SOPA or PIPA legislation.
"; + var content = "
Internet Blacklist Legislation Supporter! This company may be a supporter of the dangerous SOPA or PIPA legislation.
"; document.body.innerHTML = content + document.body.innerHTML; } From 0e43121b32a6127f8b218a905ce964eadda763ac Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Tue, 10 Jan 2012 16:27:01 -0600 Subject: [PATCH 54/63] Added close button (#1) --- sopa.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sopa.js b/sopa.js index 485b514..e428d53 100644 --- a/sopa.js +++ b/sopa.js @@ -1,4 +1,16 @@ if (!document.getElementById('stopSOPA')) { - var content = "
Internet Blacklist Legislation Supporter! This company may be a supporter of the dangerous SOPA or PIPA legislation.
"; + var content = "
" + + "Internet Blacklist Legislation Supporter!" + + "This company may be a supporter of the dangerous SOPA or PIPA legislation." + + "
×
" + + "
"; + + document.body.innerHTML = content + document.body.innerHTML; + var close = document.getElementById('stopSOPAClose'); + + close.addEventListener('click',function() { + document.getElementById('stopSOPA').style.display = 'none'; + + }); } From 390e378ce4bc40207d28f7e6697955f155d9c151 Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Tue, 10 Jan 2012 17:19:42 -0600 Subject: [PATCH 55/63] Fix for #2 via page actions (icons that appear on the URL bar) --- bg.html | 70 ++++++++++++++++++++++++++++++++++++++++++++--- icon_ignored.png | Bin 0 -> 3417 bytes manifest.json | 4 +++ sopa.js | 4 +-- 4 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 icon_ignored.png diff --git a/bg.html b/bg.html index 15ee988..ded4afd 100644 --- a/bg.html +++ b/bg.html @@ -5,12 +5,74 @@ return; } - var urlRegex = /^((\w+):\/\/)?((\w+):?(\w+)?@)?([^\/\?:]+):?(\d+)?(\/?[^\?#]+)?\??([^#]+)?#?(\w*)/; - var host = tab.url.match(urlRegex)[6].split('.').splice(-2).join('.'); - + var host = getDomain(tab); if (domains.indexOf(host) !== -1) { - chrome.tabs.executeScript(tabId, { file: 'sopa.js' }); + if (!isIgnored(host)) { + chrome.tabs.executeScript(tabId, { file: 'sopa.js' }); + chrome.pageAction.setIcon({ tabId: tabId, path: 'icon.png' }); + } else { + chrome.pageAction.setIcon({ tabId: tabId, path: 'icon_ignored.png' }); + } + chrome.pageAction.show(tabId); + } else { + chrome.pageAction.hide(tabId); } +}); + + +chrome.pageAction.onClicked.addListener(function(tab) { + var host = getDomain(tab); + if (!isIgnored(host)) { + ignore(host); + chrome.tabs.executeScript(tab.id, { code: 'document.getElementById("stopSOPA").style.display = "none";' }); + chrome.pageAction.setIcon({ tabId: tab.id, path: 'icon_ignored.png' }); + } else { + removeIgnore(host); + chrome.tabs.executeScript(tab.id, { file: 'sopa.js' }); + chrome.pageAction.setIcon({ tabId: tab.id, path: 'icon.png' }); + } }); + +function getIgnoreList() { + var list = localStorage['ignoreList']; + + if (!list) { + localStorage['ignoreList'] = JSON.stringify([]); + return getIgnoreList(); + } + + return JSON.parse(list); +} + +function removeIgnore(host) { + var list = getIgnoreList(); + for (var i=list.length;i >= 0;i--) { + if (list[i] == host) { + list.splice(i,1); + } + } + localStorage['ignoreList'] = JSON.stringify(list); +} + +function ignore(host) { + var list = getIgnoreList(); + list.push(host); + localStorage['ignoreList'] = JSON.stringify(list); +} + +function isIgnored(host) { + var list = getIgnoreList(); + + if (list && list.indexOf(host) !== -1) + return true; + return false; +} + +function getDomain(tab) { + var urlRegex = /^((\w+):\/\/)?((\w+):?(\w+)?@)?([^\/\?:]+):?(\d+)?(\/?[^\?#]+)?\??([^#]+)?#?(\w*)/; + var host = tab.url.match(urlRegex)[6].split('.').splice(-2).join('.'); + return host; +} + diff --git a/icon_ignored.png b/icon_ignored.png new file mode 100644 index 0000000000000000000000000000000000000000..ab454df1773bf4b1f70cbcf08be50e3e094a1154 GIT binary patch literal 3417 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 literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index 2395635..0dc683b 100644 --- a/manifest.json +++ b/manifest.json @@ -3,6 +3,10 @@ "version": "1.10", "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", + "page_action": { + "default_icon": "icon.png", // optional + "default_title": "Known Internet Blacklist Legislation Supporter! Click to ignore this warning for this website." // optional; shown in tooltip + }, "permissions": [ "http://*/", "https://*/", diff --git a/sopa.js b/sopa.js index e428d53..693e34d 100644 --- a/sopa.js +++ b/sopa.js @@ -4,8 +4,6 @@ if (!document.getElementById('stopSOPA')) { + "This company may be a supporter of the dangerous SOPA or PIPA legislation." + "
×
" + ""; - - document.body.innerHTML = content + document.body.innerHTML; var close = document.getElementById('stopSOPAClose'); @@ -13,4 +11,6 @@ if (!document.getElementById('stopSOPA')) { document.getElementById('stopSOPA').style.display = 'none'; }); +} else { + document.getElementById('stopSOPA').style.display = 'block'; } From f62c7358dc985cf736dd8fd1cfc9d7b6edc45309 Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Tue, 10 Jan 2012 17:21:01 -0600 Subject: [PATCH 56/63] Changing wording of tooltip on page action --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0dc683b..38097e2 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "background_page": "bg.html", "page_action": { "default_icon": "icon.png", // optional - "default_title": "Known Internet Blacklist Legislation Supporter! Click to ignore this warning for this website." // optional; shown in tooltip + "default_title": "Known Internet Blacklist Legislation Supporter! Click to toggle this popup." // optional; shown in tooltip }, "permissions": [ "http://*/", From c267a7c3160ca73c0a7c3cdfef6856466b456604 Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Tue, 10 Jan 2012 15:44:21 -0800 Subject: [PATCH 57/63] "Sony" isn't on the supporters list, but since Sony Music Entertainment is controlled by Sony, I was comfortable adding them back on the list. --- domains.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/domains.js b/domains.js index cd7743c..cd37368 100644 --- a/domains.js +++ b/domains.js @@ -104,6 +104,9 @@ var domains = [ 'scholastic.com', 'sag.org', 'sdumusic.com', + 'sony.com', + 'sony.net', + 'playstation.com', 'sonymusic.com', 'sonyatv.com', 'sonymusicnashville.com', From 6faabb174b0f43adbe39fcb207b6852a40965d3f Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Tue, 10 Jan 2012 16:13:33 -0800 Subject: [PATCH 58/63] Update spacing and increase version number for new release --- manifest.json | 2 +- sopa.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 38097e2..9ae77af 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "No SOPA", - "version": "1.10", + "version": "1.11", "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", "page_action": { diff --git a/sopa.js b/sopa.js index 693e34d..fcd9907 100644 --- a/sopa.js +++ b/sopa.js @@ -1,6 +1,6 @@ if (!document.getElementById('stopSOPA')) { var content = "
" - + "Internet Blacklist Legislation Supporter!" + + "Internet Blacklist Legislation Supporter! " + "This company may be a supporter of the dangerous SOPA or PIPA legislation." + "
×
" + "
"; From f82747714658fcf6173ea22e07a1c6d5a049605e Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Tue, 10 Jan 2012 16:18:04 -0800 Subject: [PATCH 59/63] Add link to /r/SOPA FAQ --- sopa.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sopa.js b/sopa.js index fcd9907..95492e2 100644 --- a/sopa.js +++ b/sopa.js @@ -2,8 +2,10 @@ if (!document.getElementById('stopSOPA')) { var content = "
" + "Internet Blacklist Legislation Supporter! " + "This company may be a supporter of the dangerous SOPA or PIPA legislation." - + "
×
" - + "
"; + + "
" + + "? " + + "×
" + + ""; document.body.innerHTML = content + document.body.innerHTML; var close = document.getElementById('stopSOPAClose'); @@ -13,4 +15,4 @@ if (!document.getElementById('stopSOPA')) { }); } else { document.getElementById('stopSOPA').style.display = 'block'; -} +} \ No newline at end of file From 3c44ec2979d5d6dd934b750c77852cd36ef0129e Mon Sep 17 00:00:00 2001 From: Tony Webster Date: Tue, 10 Jan 2012 20:16:47 -0800 Subject: [PATCH 60/63] Removing comments from manifest --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 9ae77af..f7f0b6a 100644 --- a/manifest.json +++ b/manifest.json @@ -4,8 +4,8 @@ "description": "Be notified if you're visiting the website of a company that supports the dangerous Stop Online Piracy Act legislation.", "background_page": "bg.html", "page_action": { - "default_icon": "icon.png", // optional - "default_title": "Known Internet Blacklist Legislation Supporter! Click to toggle this popup." // optional; shown in tooltip + "default_icon": "icon.png", + "default_title": "Known Internet Blacklist Legislation Supporter! Click to toggle this popup." }, "permissions": [ "http://*/", From a1b3c35f907c91924ed982c9f75710b4714f8971 Mon Sep 17 00:00:00 2001 From: Andy Baird Date: Wed, 11 Jan 2012 11:13:33 -0600 Subject: [PATCH 61/63] Added code for 1/18 blackout popup To test/style the popup comment line 13 out and edit blackout.js for the injected DOM --- bg.html | 13 ++++++++++++- blackout.js | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 blackout.js diff --git a/bg.html b/bg.html index ded4afd..07dec43 100644 --- a/bg.html +++ b/bg.html @@ -4,7 +4,18 @@ if (changeInfo.status !== 'complete') { return; } - + + var date = new Date(); + var blackOutHasTriggered = localStorage['blackOutComplete']; + + if ( + date.getMonth()==0 && date.getFullYear()==2012 && date.getDate()==18 + && !blackOutHasTriggered + ) { + chrome.tabs.executeScript(tabId, { file: 'blackout.js' }); + localStorage['blackOutComplete'] = true; + } + var host = getDomain(tab); if (domains.indexOf(host) !== -1) { if (!isIgnored(host)) { diff --git a/blackout.js b/blackout.js new file mode 100644 index 0000000..2903339 --- /dev/null +++ b/blackout.js @@ -0,0 +1,19 @@ +if (!document.getElementById('SOPABlackout')) { + var content = "
" + + "SOPA BLACK OUT" + + "
×
" + + "
"; + document.body.innerHTML = content + document.body.innerHTML; + var close = document.getElementById('SOPABlackoutClose'); + + close.addEventListener('click',function() { + document.getElementById('SOPABlackout').style.display = 'none'; + + }); +} else { + document.getElementById('SOPABlackout').style.display = 'block'; +} From 85a481241d6b122f049c017da8be6a920d3b6ac1 Mon Sep 17 00:00:00 2001 From: Aaron Simmons Date: Tue, 17 Jan 2012 13:48:14 -0700 Subject: [PATCH 62/63] adding RosettaStone to the list --- domains.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/domains.js b/domains.js index cd37368..1743408 100644 --- a/domains.js +++ b/domains.js @@ -311,4 +311,9 @@ var domains = [ 'ncja.org', 'csg.org', 'uschamber.com' + + // RosettaStone + // http://www.businesswire.com/news/home/20111116006532/en/Rosetta-Stone-Applauds-Progress-Bipartisan-H.R.-3261 + // http://www.change.org/petitions/rosetta-stone-oppose-legislation-sopa + 'rosettastone.com' ]; \ No newline at end of file From 8809534d877c5f7ed213af9d7628b5832d0ad8d2 Mon Sep 17 00:00:00 2001 From: Aaron Simmons Date: Tue, 17 Jan 2012 13:52:16 -0700 Subject: [PATCH 63/63] oops forgot comma --- domains.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains.js b/domains.js index 1743408..be1d882 100644 --- a/domains.js +++ b/domains.js @@ -310,7 +310,7 @@ var domains = [ 'ndaa.org', 'ncja.org', 'csg.org', - 'uschamber.com' + 'uschamber.com', // RosettaStone // http://www.businesswire.com/news/home/20111116006532/en/Rosetta-Stone-Applauds-Progress-Bipartisan-H.R.-3261