fix #110

uBlockOrigin · Aug 26, 2016 · 9cf9f7a · 9cf9f7a
1 parent 7ecc1a3
commit 9cf9f7a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 23 deletions.
diff --git a/checksums/ublock0.txt b/checksums/ublock0.txt
@@ -1,9 +1,9 @@
 c03d0e42e570bcbb2b59d26578528fa6 assets/ublock/filter-lists.json
 871cd89190e7084df95421e464070ebe assets/ublock/badware.txt
 33f4a2aa009aa05264266e66046f5ecc assets/ublock/experimental.txt
-15e9139e638acc98c31e82faa06e48c1 assets/ublock/filters.txt
+c9324221ce593caaaffb0ffa06736f11 assets/ublock/filters.txt
 ef059f65b5460a6b575efc7753ac28b8 assets/ublock/privacy.txt
-cb66b6116f68596cd1cfa567f364a134 assets/ublock/resources.txt
+a6ab1a4f72889f1f9dcccec27a3d9b78 assets/ublock/resources.txt
 512fd8b8ff37706a6faa2c92f7d79feb assets/ublock/unbreak.txt
 d5efed478760b274315df2e7cfc74b08 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt
 2b56698e1eb0a68a4c76f29963f5a513 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt

diff --git a/filters/filters.txt b/filters/filters.txt
@@ -97,7 +97,6 @@ bild.de##script:contains(Javascript)
 commentcamarche.net,foot01.com,journaldunet.com,metronews.fr##script:contains(/[Ll]igatus/)
 dayt.se##script:contains(adblock.php)
 jeux-porno.net##script:contains(/^\s*?var\s+?uniqueParam\s*?=/)
-finanzen.ch##script:contains(/^\s*function\s+UABPInject/)
 getvids.de,podcast.de,sommerhaus.de,spielespielen24.de##script:contains(/^\s*function\s+gS/)
 jav4.me##script:contains(adblock.htm)
 kino-dom.org##script:contains(my_abadiv)
@@ -698,3 +697,8 @@ m.aajtak.in##body > .storyBody:style(display: block !important)
 
 ! Remove ancestor div with random id as well
 tomshardware.com##.page-content-rightcol > .is-sticky > div[id]:has(a[href*="%26tag%3Dpurch_ramp_ab-20%26"])
+
+! https://github.com/uBlockOrigin/uAssets/issues/110
+finanzen.*##script:inject(uabinject-defuser.js)
+finanzen.*##script:inject(smartadserver.com.js)
+finanzen.*###bs_abstand
diff --git a/filters/resources.txt b/filters/resources.txt
@@ -642,26 +642,26 @@ bab-defuser.js application/javascript
 			return sto(a, b);
 		}
 	}.bind(window);
-    var signatures = [
-        ['blockadblock'],
-        ['babasbm'],
-        [/getItem\('babn'\)/],
-        ['getElementById','String.fromCharCode','ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789','charAt','DOMContentLoaded','addEventListener','doScroll','fromCharCode','sessionStorage','localStorage','Math.random']
-    ];
-    var check = function(s) {
-        var tokens, match, j, token;
-        for ( var i = 0; i < signatures.length; i++ ) {
-            tokens = signatures[i];
-            match = true;
-            for ( j = 0, pos = 0; j < tokens.length && match; j++ ) {
-                token = tokens[j]
-                pos = token instanceof RegExp ? s.search(token) : s.indexOf(token, pos);
-                if ( pos === -1 ) { match = false; }
-            }
-            if ( match ) { return true; }
-        }
-        return false;
-    };
+	var signatures = [
+		['blockadblock'],
+		['babasbm'],
+		[/getItem\('babn'\)/],
+		['getElementById','String.fromCharCode','ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789','charAt','DOMContentLoaded','addEventListener','doScroll','fromCharCode','sessionStorage','localStorage','Math.random']
+	];
+	var check = function(s) {
+		var tokens, match, j, token;
+		for ( var i = 0; i < signatures.length; i++ ) {
+			tokens = signatures[i];
+			match = true;
+			for ( j = 0, pos = 0; j < tokens.length && match; j++ ) {
+				token = tokens[j]
+				pos = token instanceof RegExp ? s.search(token) : s.indexOf(token, pos);
+				if ( pos === -1 ) { match = false; }
+			}
+			if ( match ) { return true; }
+		}
+		return false;
+	};
 	var realEval = window.eval;
 	window.eval = function(a) {
 		if ( !check(a) ) {
@@ -1427,3 +1427,12 @@ trafictube.ro.js application/javascript
 		return z(a, b);
 	}.bind(window);
 })();
+
+
+# https://github.com/uBlockOrigin/uAssets/issues/110
+smartadserver.com.js application/javascript
+Object.defineProperties(window, {
+	SmartAdObject: { value: function(){} },
+	SmartAdServerAjax: { value: function(){} },
+	smartAd: { value: { LoadAds: function() {}, Register: function() {} } }
+});