diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 69aa9543f..3c3a44aa4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -117,6 +117,7 @@ tek.no#?#div.clearfix.col-full-width:-abp-contains(kommersielle partner) ticketmaster.no,ticketmaster.dk##div[id^=ad-slot-] trening.no##.cp-slidein-body tv2.no,abcnyheter.no,medier24.no##a[href*="adform.net"] +tvkampen.com,tvsporten.dk#$#abort-on-property-write onload tvkampen.com,tvsporten.dk##a.p-icon.partner vartoslo.no#?#.vc_column-inner:-abp-has(.vo-annonse):not(:-abp-has(div[class^=td_module_])):not(:-abp-has(#sb_instagram)) vb.is##.spons @@ -125,6 +126,7 @@ vg.no##.betting-widgets vg.no##.tipster vg.no##.wid-betting vg.no#?#.partner-studio:not(:-abp-has(a[href*="/nordiskfilm/"])) +vg.no,e24.no,gamer.no,tek.no,digi.no#$#abort-on-property-write __AB__ vgtv.no##.apnx-container vgtv.no##.video-branding viafree.no,viafree.dk##.ad-click-through @@ -694,8 +696,10 @@ live.nettavisen.no#@#.active > div @@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk @@||sixscissors.com^$third-party,domain=itavisen.no +1200kcalkostplan.dk,1800kcalkostplan.dk#$#abort-on-property-write KillAdBlock csp.screen9.com#@#.adsbox godt.no##.adblock-info-box +gratisspil.dk#$#abort-on-property-write AdBlockerInfo langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opacity"] langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"] minmote.no,godt.no##.adblock-info @@ -757,6 +761,7 @@ vglive.no##.tipster-liveodds-embed ! 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. ! 🇩🇰: Disse regler bliver synkroniseret med de hos «Frellwit's Swedish Filter» med nogle måneders mellemrum, så det hadde blivet for tungt at kategorisere dem. ! 🇬🇧: These entries are synchronised with those of "Frellwit's Swedish Filter" every few months-ish, and as such it'd be too much work to categorise them. +gamereactor.no,gamereactor.dk#$#abort-on-property-write banner_video ||gamereactor.*/lay/ad-video-stats.,script ||gamereactor.*/lay/js/adblock_desktop.,script ||gamereactor.*/lay/js/background.,script diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index eef98e774..31f404dc6 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -121,7 +121,7 @@ ticketmaster.no,ticketmaster.dk##div[id^=ad-slot-] trening.no##.cp-slidein-body tv2.no,abcnyheter.no,medier24.no##a[href*="adform.net"] tv2.no##+js(json-prune, enabled, testhide) -tvkampen.com,tvsporten.dk##+js(abort-on-property-write.js, onload) +tvkampen.com,tvsporten.dk#%#//scriptlet(abort-on-property-write, "onload") tvkampen.com,tvsporten.dk##.custom-background:style(background-image: none !important) tvkampen.com,tvsporten.dk##a.p-icon.partner vartoslo.no#?#.vc_column-inner:-abp-has(.vo-annonse):not(:-abp-has(div[class^=td_module_])):not(:-abp-has(#sb_instagram)) @@ -132,7 +132,7 @@ vg.no##.betting-widgets vg.no##.tipster vg.no##.wid-betting vg.no#?#.partner-studio:not(:-abp-has(a[href*="/nordiskfilm/"])) -vg.no,e24.no,gamer.no,tek.no,digi.no##+js(abort-on-property-write.js, __AB__) +vg.no,e24.no,gamer.no,tek.no,digi.no#%#//scriptlet(abort-on-property-write, "__AB__") vgtv.no##+js(golem.de.js) vgtv.no##.apnx-container vgtv.no##.video-branding @@ -717,12 +717,12 @@ live.nettavisen.no#@#.active > div @@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk @@||sixscissors.com^$third-party,domain=itavisen.no -1200kcalkostplan.dk,1800kcalkostplan.dk##+js(abort-on-property-write.js, KillAdBlock) +1200kcalkostplan.dk,1800kcalkostplan.dk#%#//scriptlet(abort-on-property-write, "KillAdBlock") csp.screen9.com#@#.adsbox dagensbyggeri.dk##+js(setTimeout-defuser.js, (), 2500) eurosport.no,eurosport.dk##+js(addEventListener-defuser.js, contextmenu) godt.no##.adblock-info-box -gratisspil.dk##+js(abort-on-property-write.js, AdBlockerInfo) +gratisspil.dk#%#//scriptlet(abort-on-property-write, "AdBlockerInfo") langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opacity"] langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"] minmote.no,godt.no##.adblock-info @@ -794,7 +794,7 @@ vglive.no##.tipster-liveodds-embed ! 🇬🇧: These entries are synchronised with those of "Frellwit's Swedish Filter" every few months-ish, and as such it'd be too much work to categorise them. gamereactor.no,gamereactor.dk###pagebackground:style(background-image: none !important) gamereactor.no,gamereactor.dk##+js(abort-current-inline-script.js, phpads_deliver) -gamereactor.no,gamereactor.dk##+js(abort-on-property-write.js, banner_video) +gamereactor.no,gamereactor.dk#%#//scriptlet(abort-on-property-write, "banner_video") gamereactor.no,gamereactor.dk##+js(set-constant.js, adblockEnabled, noopFunc) gamereactor.no,gamereactor.dk##+js(set-constant.js, trackAdblock, noopFunc) ||gamereactor.*/lay/ad-video-stats.$important,script diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 2a041291c..de846986f 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -152,6 +152,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"##\+js\(abort-on-property-write.js, (.*)\)", + r'#%#//scriptlet(abort-on-property-write, "\1")', + line + ) + text += line + '\r\n' return text @@ -414,6 +420,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"##\+js\(abort-on-property-write.js, (.*)\)", + r"#$#abort-on-property-write \1", + line + ) + if is_supported_abp(line): text += line + '\r\n'