From bd96aa7ea3ffdbfe08f7aba1a273f5d4e70b4c72 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 22 Jan 2016 14:03:43 -0500
Subject: [PATCH] this fixes #1240

---
 assets/checksums.txt        |  2 +-
 assets/ublock/resources.txt | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/assets/checksums.txt b/assets/checksums.txt
index cdc28eb74..088ea4641 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -5,7 +5,7 @@
 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt
 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt
 a2c0edc2da6a2ba591d83f9a105a8401 assets/ublock/experimental.txt
-87431bb2ea3525744b676607d6bc321c assets/ublock/resources.txt
+ee35fb6b1cb863410e6c96734c7e6bdb assets/ublock/resources.txt
 04a27507388e91e924cabf1d2e88557c assets/ublock/filter-lists.json
 50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt
 61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt
diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt
index ab0700daf..9daaaca49 100644
--- a/assets/ublock/resources.txt
+++ b/assets/ublock/resources.txt
@@ -403,21 +403,27 @@ yavli-defuser.js application/javascript
 			return '';
 		}
 	};
-	var noy = {
-		start: noopfn
-	};
 	try {
 		Object.defineProperty(window, '__durl', nourl);
 		Object.defineProperty(window, '__lsurl', nourl);
 		Object.defineProperty(window, '__lturl', nourl);
-		Object.defineProperty(window, '_y', {
-			set: noopfn,
-			get: function() {
-				return noy;
-			}
-		});
 	} catch (ex) {
 	}
+	var aa = ['_x','_y'];
+	var no = {
+		set: noopfn,
+		get: function() {
+			return {
+				start: noopfn
+			};
+		}
+	};
+	while ( aa.length ) {
+		try {
+			Object.defineProperty(window, aa.pop(), no);
+		} catch (e) {
+		}
+	}
 })();