From ee0cccf663ba9b93fe582facb82e98dcde0820f8 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 28 Feb 2016 10:18:57 -0500 Subject: [PATCH] fixed logic error re. #1240 --- assets/checksums.txt | 4 ++-- assets/ublock/filters.txt | 2 +- assets/ublock/resources.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index 5bdaa811f..f9b71a375 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,11 +1,11 @@ 538211a2228745b51b615b1b245cf99e assets/ublock/unbreak.txt 62111a29f0a5cb361ba8dbae92054adb assets/ublock/redirect-resources.txt 3d4af0ad6a79ef9940737691d78a6f10 assets/ublock/privacy.txt -3e6e1b188425643e578c11148367e79f assets/ublock/filters.txt +ad5c563cb0203fb48704cc75d4f46f8e assets/ublock/filters.txt 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt 12b0660eebed61255fc67ad185dfd4e8 assets/ublock/experimental.txt -b201da0c7bd2fa98e59e05219bff2f3d assets/ublock/resources.txt +c3613efb3ab043f2a6cb8865f783beb4 assets/ublock/resources.txt 059e0bfbf22bd242dda7b07389fe09a2 assets/ublock/filter-lists.json 3605c73f21abca428c7eb69a8bc32dfe assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt a91af77c47c302c0741c7445b0fada1a assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt index e2f4a46d8..9bc138357 100644 --- a/assets/ublock/filters.txt +++ b/assets/ublock/filters.txt @@ -232,7 +232,7 @@ skystreaming.net###fanback + style + div[id] # AdDefend 1erforum.de,20min.ch,abendzeitung-muenchen.de,allgemeine-zeitung.de,arcor.de,ariva.de,auto-motor-und-sport.de,autoextrem.de,boerse-online.de,buerstaedter-zeitung.de,computerbild.de,comunio.de,echo-online.de,fanfiktion.de,fem.com,finanzen.net,focus.de,foot01.com,gamestar.de,gelnhaeuser-tageblatt.de,general-anzeiger-bonn.de,giessener-anzeiger.de,hochheimer-zeitung.de,hofheimer-zeitung.de,kabeleins.de,kreis-anzeiger.de,lampertheimer-zeitung.de,lauterbacher-anzeiger.de,lpgforum.de,lustich.de,main-spitze.de,motorradonline.de,notebookcheck.*,oberhessische-zeitung.de,pcwelt.de,prosieben.de,prosiebenmaxx.de,rhein-main-presse.de,rp-online.de,runnersworld.de,sat1.de,sat1gold.de,serienjunkies.de,sixx.de,spiegel.de,spox.com,shz.de,teccentral.de,the-voice-of-germany.de,transfermarkt.de,tvspielfilm.de,tvtoday.de,usinger-anzeiger.de,webfail.com,wetter.com,wetteronline.at,wetteronline.de,wiesbadener-kurier.de,wiesbadener-tagblatt.de,winboard.org,wn.de,wormser-zeitung.de##script:inject(uabinject-defuser.js) -# Yavli ads * +# Yavli ads activistpost.com,addictinginfo.org,alfonzorachel.com,allenwestrepublic.com,aplus.com,bizpacreview.com,boredpanda.com,breathecast.com,bulletsfirst.net,cheatsheet.com,clashdaily.com,comicallyincorrect.com,conservativebyte.com,conservativeintel.com,conservativetribune.com,conservativevideos.com,cowboybyte.com,crossmap.com,dailysurge.com,dccrimestories.com,dilbert.com,drhotze.com,eaglerising.com,explosm.net,flexonline.com,genfringe.com,girlsjustwannahaveguns.com,hellou.co.uk,instigatornews.com,joeforamerica.com,latinpost.com,libertyunyielding.com,mensfitness.com,minutemennews.com,mobilelikez.com,muscleandfitness.com,naturalblaze.com,oddee.com,okmagazine.com,patriotoutdoornews.com,pitgrit.com,radaronline.com,redmaryland.com,reverbpress.com,reviveusa.com,rightwingnews.com,segmentnext.com,shark-tank.com,sportsmole.co.uk,theblacksphere.net,thefreethoughtproject.com,thegatewaypundit.com,themattwalshblog.com,thepoke.co.uk,tinypic.com,traileraddict.com,unilad.co.uk,valuewalk.com,vcpost.com,victoriajackson.com,viralnova.com,viralthread.com##script:inject(yavli-defuser.js) # https://github.com/gorhill/uBlock/issues/1094 diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt index c01373be2..75ada218e 100644 --- a/assets/ublock/resources.txt +++ b/assets/ublock/resources.txt @@ -427,7 +427,7 @@ yavli-defuser.js application/javascript var sto = window.setTimeout; window.setTimeout = function(a, b) { var re = /rec\(rid,\s*tw\s*\+\s*step\)/; - if ( (typeof b !== 'number' || (b % 200) === 0) && !re.test(a.toString()) ) { + if ( typeof b !== 'number' || (b % 200) !== 0 || !re.test(a.toString()) ) { sto(a, b); } };