simplify

2012-11-19 20:42:11 +13:00 · 2012-11-19 20:42:11 +13:00 · 84c38698f0
commit 84c38698f0
parent 4367739251
5 changed files with 52 additions and 55 deletions
--- a/fanboy-adblock/fanboy-elements-exceptions.txt
+++ b/fanboy-adblock/fanboy-elements-exceptions.txt
@ -4,9 +4,11 @@
 ~10tv.com##.ad-square
 ~10tv.com,~andkon.com,~creatormundi.com,~eonline.com,~mobithinking.com,~reelz.com,~televisionwithoutpity.com,~wired.com##.advertisement
 ~123poi.com##.bottomAds
-~2leep.com,~dds.nl###adbox
+~2leep.com###adbox
 ~318racing.org,~linuxforums.org##.ad_global_header
+~4029tv.com,~wesh.com,~wmur.com###adBelt
 ~4kidstv.com###myAd
+~4kidstv.com,~mac-sports.com##.adspace
 ~4sysops.com,~autogidas.lt,~ew.com,~globalsecurity.org###adtop
 ~7-eleven.com##.right-ad
 ~72tips.com,~bumpshack.com,~isource.com,~millionairelottery.com,~montrealmirror.com,~pdrhealth.com###topad
@ -88,7 +90,6 @@
 ~dailymotion.com##.right_ads_column
 ~dds.nl###adBox
 ~dealsonwheels.com,~happypancake.com,~makers.com##.ad-wrapper
-~deejay.it##.advertorial
 ~deluxemusic.tv##.article_ad
 ~demotywatory.pl##.miniad
 ~departures.com###top-advertisements
@ -110,6 +111,7 @@
 ~egotastic.com###ad468
 ~egreetings.com###ad-header-728x90
 ~elle.com###ad-leaderboard
+~elledecor.com,~nydailynews.com,~tvland.com##.ad_728x90
 ~empowher.com##.adTopHome
 ~ensonhaber.com,~opposingviews.com##div[id^="div-gpt-ad-"]
 ~environmentjob.co.uk,~lowcarbonjobs.com##.ad_description
@ -131,6 +133,7 @@
 ~freeads.co.uk##.postad
 ~frogueros.com,~northwestfm.co.za##.publicidad
 ~fropper.com,~madame.lefigaro.fr,~themonthly.com.au###ad-container
+~frumforum.com,~windows7gadgets.net###adwrapper
 ~gaelick.com,~romstone.net###sidebar-ads
 ~gamecopyworld.com,~gamecopyworld.eu,~morningstar.com###adright
 ~gamereactor.dk,~gamereactor.se,~gamereactor.eu,~gamereactor.es###ads_right
@ -210,7 +213,6 @@
 ~lolhit.com##.leftAd
 ~lolhit.com##.leftad
 ~losseveter.nl,~wellsfargo.com###mainAd
-~mac-sports.com,~4kidstv.com##.adspace
 ~macrumors.com###banner_topad
 ~mail.google.com##.ad5
 ~mail.google.com##.ad6
@ -238,7 +240,7 @@
 ~mergermarket.com##.banner_ad
 ~mexx.ca###ads_bottom
 ~michaels.com###ad_header
-~microsoft.com,~northjersey.com,~o2online.de##.adSpace
+~microsoft.com,~northjersey.com##.adSpace
 ~milenio.com##.banner_728x90
 ~mobithinking.com##.image-advertisement
 ~mocpages.com##.advertisement-swimlane
@ -253,6 +255,7 @@
 ~namesecure.com,~superhry.cz##.adHolder
 ~natgeo.tv###ad728x90
 ~nbc.com###videoAd
+~nbc.com,~syfygames.com###ad_unit
 ~neowin.net###topBannerAd
 ~newegg.com###leaderBoardAd
 ~newgrowbook.com###headerAd
@ -337,7 +340,6 @@
 ~surf.to###adFrame
 ~swns.com##.header_ad
 ~syfygames.com,~apnaohio.com###ad_content
-~syfygames.com,~nbc.com###ad_unit
 ~techreport.com##.ad_160
 ~tei-c.org###msad
 ~theanimalrescuesite.com,~thebreastcancersite.com,~therainforestsite.com,~thehungersite.com##.adLink
@ -360,7 +362,6 @@
 ~truecar.com###logo_ad
 ~tv3.ie###ad_leader
 ~tvland.com##.ad_promo
-~tvland.com,~elledecor.com,~nydailynews.com##.ad_728x90
 ~tvlistings.aol.com##.ad-wide
 ~uploadic.com,~komikadamlar.com##.reklam
 ~usairways.com##.adarea
@ -371,8 +372,6 @@
 ~webmail.verizon.net###adcolumn
 ~webphunu.net##.flash-advertisement
 ~webtoolhub.com##.sb_adsNv2
-~wesh.com,~4029tv.com,~wmur.com###adBelt
-~windows7gadgets.net,~frumforum.com###adwrapper
 ~worldsnooker.com##.homead
 ~wretch.cc###ad_square
 ~yahoo.com###ad-west
--- a/fanboy-adblock/fanboy-elements-generic.txt
+++ b/fanboy-adblock/fanboy-elements-generic.txt
@ -1622,11 +1622,8 @@
 ###baseboard-ad
 ###baseboard-ad-wrapper
 ###bb_ad_container
-###bbccom_leaderboard_container
 ###bbccom_mpu
-###bbccom_sponsor_section
 ###bbccom_sponsor_section_text
-###bbccom_storyprintsponsorship
 ###bbContentAds
 ###bbo_ad1
 ###bcaster-ad
@ -4756,7 +4753,7 @@
 ##.adNoticeOut
 ##.adOne
 ##.adonmedianama
-##.adops.textlinks
+##.adops
 ##.adOverlay
 ##.adp-AdPrefix
 ##.adpacks
@ -5476,6 +5473,7 @@
 ##.advertLink1
 ##.AdvertMidPage
 ##.advertnotice
+##.advertorial
 ##.advertorial2
 ##.advertorial_728x90
 ##.advertplay
--- a/fanboy-adblock/fanboy-elements-specific.txt
+++ b/fanboy-adblock/fanboy-elements-specific.txt
@ -274,6 +274,7 @@ answers.com###h_ads1
 anyclip.com##.banner
 anyclip.com##.banner_bottom
 aol.ca###rA
+aol.co.uk###rA
 aol.co.uk###tdiv71
 aol.co.uk##.moreOnAsylum
 aol.co.uk##.SLL
@ -282,6 +283,7 @@ aol.com###ai300x250
 aol.com###banner_div
 aol.com###dmn_results
 aol.com###gsl-bottom
+aol.com###rA
 aol.com###spA
 aol.com###splink
 aol.com###splinkRight
@ -290,7 +292,6 @@ aol.com##.lft120x60
 aol.com##.spon_by
 aol.com##.topAd
 aol.com##a[href^="http://www.opselect.com/ad_feedback/"]
-aol.com,aol.co.uk###rA
 aolradio.slacker.com###rightBanner
 ap.org###ad
 ap.org###rectangle
@ -501,6 +502,9 @@ bayofplentytimes.co.nz###salesCarouselContainer
 bayofplentytimes.co.nz##.marketPlace
 bayt.com##.banner
 bayt.com##.square
+bbc.co.uk###bbccom_leaderboard_container
+bbc.co.uk###bbccom_sponsor_section
+bbc.co.uk###bbccom_storyprintsponsorship
 bbc.co.uk##.bbccom_companion
 bbc.com###bbccom_button
 bbc.com###bbccom_leaderboard
--- a/fanboy-adblock/fanboy-generic.txt
+++ b/fanboy-adblock/fanboy-generic.txt
@ -105,6 +105,7 @@
 -sponsored-links-
 -strip-ads-
 -theme/ads/
+.1d/ads/
 .ad.footer.
 .ad.page.
 .ad1.nspace
@ -115,6 +116,7 @@
 .ads_clickthru.
 .adsbox.
 .adsense.
+.adserv/
 .adserver.
 .adspace.
 .adtech_
@ -123,6 +125,7 @@
 .asp?coad
 .aspx?adid=
 .aspx?zoneid=
+.au/ads/
 .bbn.by/
 .biz/ads/
 .bns1.net/
@ -134,33 +137,27 @@
 .clkads.
 .co.nz/ad/
 .co/ads/
-.com.au/ads/
 .com.au/banners/$subdocument
 .com.eg/ads/
 .com/a?network
 .com/a?pagetype
 .com/a?size
-.com/ad.htm
-.com/ad.js
+.com/ad.
 .com/ad/
 .com/ad2/
 .com/ad6/
 .com/adds/
-.com/adfile/
 .com/adgallery
-.com/adimg/
 .com/adinf/
 .com/adlib/
 .com/adlib_
-.com/adpage/
 .com/adpicture
 .com/ads-
 .com/ads.
-.com/ads/$image,subdocument,object
+.com/ads/$image,object,subdocument
 .com/ads?
 .com/ads_
 .com/adser/
-.com/adtags/
 .com/adv/
 .com/adv3/
 .com/advt/
@ -171,12 +168,10 @@
 .com/interstitial.
 .com/iplgadshow
 .com/js.ng/
-.com/js/ads.
 .com/js/adsense
 .com/miads/
 .com/peels/
 .com/promodisplay?
-.com/promoloaddisplay?
 .cz/bannery/
 .eu/ads/
 .gr/ads/
@ -199,7 +194,7 @@
 .net/adj/$third-party
 .net/adj;
 .net/ads.
-.net/ads/$image,subdocument
+.net/ads/
 .net/ads?
 .net/ads_
 .net/adv/
@ -210,7 +205,7 @@
 .net/pfadj/
 .oasfile.
 .openx.
-.org/ad.html
+.org/ad.
 .org/ad/
 .org/adgallery1
 .org/ads-
@ -249,7 +244,6 @@
 .ws/banners/
 .za/ads/
 /!advert_
-/.adserv/*
 /1/ads/*
 /125x125ad.
 /2011/ads/*
@ -270,9 +264,8 @@
 /_svc/ad/*
 /a.aspx?zone
 /abm.asp?
-/abm.aspx?
-/abmw.asp?
-/abmw.aspx?
+/abm.aspx
+/abmw.asp
 /acc_random=
 /ad%20images/*
 /ad-300x250_
@ -446,7 +439,6 @@
 /ad_600_
 /ad_728.
 /ad_728_
-/ad_adify.
 /ad_agency/*
 /ad_area.
 /ad_banner.
@ -569,7 +561,7 @@
 /adactions.
 /adaffiliate_
 /adanalytics.
-/adaptvadplayer.js
+/adaptvadplayer.
 /adaptvadservervastvideo.
 /adaptvexchangevastvideo.
 /adasset/*
@ -692,6 +684,7 @@
 /adfetch?
 /adfetcher?
 /adfile.
+/adfile/*
 /adfiles.
 /adfillers/*
 /adflash.
@ -755,6 +748,7 @@
 /adimages.
 /adimages/*
 /adimg.
+/adimg/*
 /adinator/*
 /adinclude.
 /adindicatortext.
@ -788,8 +782,7 @@
 /adlock300.
 /adlog.php?
 /admain.
-/adman/js/*
-/adman/www/*
+/adman/*
 /admanagement/*
 /admanagementadvanced.
 /admanager.js
@ -812,12 +805,13 @@
 /admin/ad_
 /admob.
 /admonitor.
+/adnet.
 /adnet/*
 /adnet2.
 /adnetmedia.
 /adnetwork.
 /adnetwork/*
-/adng.html?
+/adng.html
 /adobject.
 /adocean.
 /adoptionicon.
@ -828,9 +822,10 @@
 /adoverlayplugin.
 /adoverride.
 /adp-pro/*
-/adp.html
+/adp.htm
 /adpage-
 /adpage.
+/adpage/*
 /adpages/*
 /adpanel/*
 /adpanelcontent.
@ -902,7 +897,7 @@
 /ads.aspx
 /ads.cfm?
 /ads.dll/*
-/ads.gif?
+/ads.gif
 /ads.htm
 /ads.js.
 /ads.js/*
@ -920,7 +915,6 @@
 /ads/acctid=
 /ads/ad.
 /ads/ad_
-/ads/adnet.
 /ads/ads-$~stylesheet
 /ads/ads.
 /ads/ads/*
@ -1108,7 +1102,7 @@
 /adsecondary.
 /adsence.
 /adsend.
-/adsense-$~stylesheet
+/adsense-
 /adsense.
 /adsense/*
 /adsense1.
@ -1239,6 +1233,7 @@
 /adtagcms.
 /adtago.
 /adtags.
+/adtags/*
 /adtagtc.
 /adtaily_
 /adtaobao.
@ -1285,8 +1280,7 @@
 /adutils.
 /adv-1.
 /adv-2.
-/adv.asp?
-/adv.aspx?
+/adv.asp
 /adv/adv_
 /adv/lrec_
 /adv_banner_
@ -1298,7 +1292,7 @@
 /advengine.
 /adverfisement.
 /adverfisement2.
-/advert-$~stylesheet,~object-subrequest
+/advert-
 /advert.
 /advert/*
 /advert1.
@ -1308,17 +1302,17 @@
 /advert4.
 /advert5.
 /advert6.
-/advert_$~object-subrequest
+/advert_
 /advertbanner2.
 /adverthorisontalfullwidth.
 /advertical.
 /advertise-
 /advertise.
 /advertise/*
-/advertise_$image,script,subdocument
+/advertise_
 /advertisehere.
 /advertisement-
-/advertisement.$image,script,subdocument
+/advertisement.
 /advertisement/*
 /advertisement1.
 /advertisement2.
@ -1516,7 +1510,7 @@
 /blogads-
 /blogads.
 /blogads2_
-/blogads3/*$~stylesheet
+/blogads3/*
 /blogads_
 /blogadsbg.
 /bloggerex.
@ -1569,7 +1563,6 @@
 /clkads.
 /cn-advert.
 /cnads.js
-/cnwk.1d/ads/*
 /codaadconfig.
 /collisionadmarker.
 /colorscheme/ads/*
@ -1747,8 +1740,7 @@
 /flash-ads.
 /flash/ad/*
 /flash/advertis
-/flash_ads.$~stylesheet
-/flash_advertising/*
+/flash_ads.
 /flashad.
 /flashads/*
 /float-ads/*
@ -1848,7 +1840,7 @@
 /google_afs_widget/*
 /google_radlinks_
 /googlead-
-/googlead.$~stylesheet
+/googlead.
 /googlead1.
 /googlead160.
 /googlead300.
@ -2008,6 +2000,7 @@
 /js.ng/site=
 /js.ng/size=
 /js/ads-
+/js/ads.
 /js/ads_
 /js/doubleclick/*
 /js/oas-
@ -2129,7 +2122,7 @@
 /oascentral.
 /oascentral/*
 /oascontroller.
-/oasdefault/*$image
+/oasdefault/*
 /oasisi-
 /oasisi.
 /oasx/*
@ -2181,6 +2174,7 @@
 /parts/ad/*
 /pauseadextension.
 /payperpost.
+/peel.js
 /peel_ads/*
 /peelad/*
 /peelads/*
@ -2247,6 +2241,7 @@
 /processing/impressions.asp?
 /projectwonderful_
 /promo/ads/*
+/promoloaddisplay?
 /promotions/ads?
 /proxxorad.
 /pub/ad/*
@ -2327,7 +2322,6 @@
 /scripts/ad.
 /scripts/ad_
 /scripts/ads.
-/scripts/peel.js
 /scrollads/*
 /search/ads_
 /searchad_
@ -2723,6 +2717,7 @@ _adframe_
 _adhome.
 _adhome_
 _adhub_
+_adify.
 _adjug.
 _adlabel_
 _adlesse.
@ -2732,7 +2727,7 @@ _adobjects.
 _adright.
 _adrow-
 _ads.cgi
-_ads.html?
+_ads.html
 _ads.js?
 _ads.php?
 _ads/iframe.
@ -2777,6 +2772,7 @@ _advertise180.
 _advertisement.
 _advertisement_
 _advertising.
+_advertising/
 _advertising_header.
 _advertising_iframe.
 _advertisment.
--- a/fanboy-adblock/fanboy-thirdparty.txt
+++ b/fanboy-adblock/fanboy-thirdparty.txt
@ -639,9 +639,9 @@
 ||cybermonitor.com^$third-party
 ||cybmas.com^$third-party
 ||d.m3.net^$third-party
-||d1ade4ciw4bqyc.cloudfront.net^$third-party
-||d1k74lgicilrr3.cloudfront.net^$third-party
-||d3lvr7yuk4uaui.cloudfront.net^$third-party
+||d1ade4ciw4bqyc.cloudfront.net^
+||d1k74lgicilrr3.cloudfront.net^
+||d3lvr7yuk4uaui.cloudfront.net^
 ||da-ads.com^$third-party
 ||da.feedsportal.com^$~subdocument
 ||dashboardad.net^$third-party