Merge remote-tracking branch 'upstream/master' into safari

# Conflicts: # README.md
el1t · Jan 12, 2017 · 4d662bf · 4d662bf
2 parents 945142c + 257dd27
commit 4d662bf
Show file tree

Hide file tree

Showing 25 changed files with 1,445 additions and 1,101 deletions.
diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json
@@ -20,10 +20,16 @@
 		"supportURL": "http://noads.it/"
 	},
 	"https://adguard.com/en/filter-rules.html?id=1": {
+		"off": true,
+		"title": "RUS: Adguard Russian Filter (obsolete, will be removed)",
+		"group": "regions",
+		"supportURL": "https://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard"
+	},
+	"https://filters.adtidy.org/extension/chromium/filters/1.txt": {
 		"off": true,
 		"title": "RUS: Adguard Russian Filter",
 		"group": "regions",
-		"supportURL": "http://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard"
+		"supportURL": "https://forum.adguard.com/forumdisplay.php?69-%D0%A4%D0%B8%D0%BB%D1%8C%D1%82%D1%80%D1%8B-Adguard"
 	},
 	"https://easylist-downloads.adblockplus.org/advblock.txt": {
 		"off": true,
@@ -328,11 +334,17 @@
 		"supportURL": "https://forums.lanik.us/"
 	},
 	"https://adguard.com/filter-rules.html?id=13": {
+		"off": true,
+		"title": "TUR: Adguard Turkish Filter (obsolete, will be removed)",
+		"group": "regions",
+		"supportURL": "http://forum.adguard.com/forumdisplay.php?51-Filter-Rules"
+	},
+	"https://filters.adtidy.org/extension/chromium/filters/13.txt": {
 		"off": true,
 		"title": "TUR: Adguard Turkish Filter",
 		"group": "regions",
 		"lang": "tr",
-		"supportURL": "http://forum.adguard.com/forumdisplay.php?51-Filter-Rules"
+		"supportURL": "https://forum.adguard.com/forumdisplay.php?51-Filter-Rules"
 	},
 	"https://www.fanboy.co.nz/fanboy-vietnam.txt": {
 		"off": true,

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.10.2",
+    "version": "1.10.5.9",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
@@ -443,11 +443,7 @@ vAPI.tabs.open = function(details) {
 
         // Open in a standalone window
         if ( details.popup === true ) {
-            chrome.windows.create({
-                url: details.url,
-                focused: details.active,
-                type: 'popup'
-            });
+            chrome.windows.create({ url: details.url, type: 'popup' });
             return;
         }