Merge tag '1.15.4'

nicole-ashley · Feb 4, 2018 · 6f3d8e7 · 6f3d8e7
2 parents 1a9a74f + 43eab7a
commit 6f3d8e7
Show file tree

Hide file tree

Showing 100 changed files with 4,112 additions and 2,204 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -74,6 +74,13 @@
 			"assets/ublock/resource-abuse.txt"
 		]
 	},
+	"ublock-annoyances": {
+		"content": "filters",
+		"group": "default",
+		"title": "uBlock filters – Annoyances",
+		"off": true,
+		"contentURL": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt"
+	},
 	"ublock-unbreak": {
 		"content": "filters",
 		"group": "default",
@@ -417,7 +424,7 @@
 		"off": true,
 		"title": "IRN: Adblock-Iran",
 		"lang": "fa",
-		"contentURL": "https://raw.githubusercontent.com/farrokhi/adblock-iran/master/filter.txt",
+		"contentURL": "https://cdn.rawgit.com/farrokhi/adblock-iran/master/filter.txt",
 		"supportURL": "https://github.com/farrokhi/adblock-iran"
 	},
 	"ISL-0": {
@@ -585,14 +592,14 @@
 		"contentURL": "https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt",
 		"supportURL": "https://github.com/betterwebleon/slovenian-list"
 	},
-	"SWE-0": {
+	"SWE-1": {
 		"content": "filters",
 		"group": "regions",
 		"off": true,
-		"title": "SWE: Fanboy's Swedish",
+		"title": "SWE: Frellwit's Swedish Filter",
 		"lang": "sv",
-		"contentURL": "https://www.fanboy.co.nz/fanboy-swedish.txt",
-		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
+		"contentURL": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt",
+		"supportURL": "https://github.com/lassekongo83/Frellwits-filter-lists"
 	},
 	"TUR-0": {
 		"content": "filters",

diff --git a/dist/README.md b/dist/README.md
@@ -22,7 +22,7 @@ Remember that you have to update manually also. For some users, updating manuall
 
 ### Firefox webext
 
-Compatible with Firefox 52 and beyond. This works only if you set `xpinstall.signatures.required` to `false` in `about:config`.
+Compatible with Firefox 52 and beyond. This works only if you set `xpinstall.signatures.required` to `false` in `about:config`.<sup>[see "Add-on signing in Firefox"](https://support.mozilla.org/en-US/kb/add-on-signing-in-firefox)</sup>
 
 - Download `ublock0.webext.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
     - Right-click and choose _"Save As..."_.
@@ -39,7 +39,7 @@ Compatible with Firefox 24 to Firefox 56.
 - Download `ublock0.firefox.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)). 
 - Drag and drop the previously downloaded `ublock0.firefox.xpi` into Firefox
 
-With Firefox 43 and beyond, you may need to toggle the setting `xpinstall.signatures.required` to `false` in `about:config`.
+With Firefox 43 and beyond, you may need to toggle the setting `xpinstall.signatures.required` to `false` in `about:config`.<sup>[see "Add-on signing in Firefox"](https://support.mozilla.org/en-US/kb/add-on-signing-in-firefox)</sup>
 
 Your uBlock Origin settings are kept intact even after you uninstall the addon.
 

diff --git a/dist/description/description-fa.txt b/dist/description/description-fa.txt
@@ -2,11 +2,11 @@
 
 بررسی تصویری از کارایی این محصول: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 
-کاربرد: دکمه ی پاور بزرگ در پنجره برای فعال یا غیر فعال کردن uBlock برای صفحه ی جاری است. فقط برای همین سایت اعمال میشود، دکمه ی پاوری برای تمام سایت ها نیست.
+روش استفاده: دکمۀ قدرت بزرگ در پنجرۀ بالاپَر برای فعال یا غیرفعال کردن دائمی یوبلاک برای وب‌سایت فعلی می‌باشد. این فقط برای همین سایت اعمال میشود، این دکمه ی قدرتی برای تمام سایت ها نیست.
 
 ***
 
-انعطاف پذیری آن بیشتر از "ad blocker" است: همچنین می تواند فیلتر ها را از هاست میزبان، بخواند و بسازد.
+انعطاف پذیری آن بیشتر از "ad blocker" است: این یکی همچنین می تواند فیلتر‌هایی را از فایل‌های هاست‌های میزبان، خوانده و بسازد.
 
 بیرون از جعبه، این لیست فیلترها بارگذاری و اجرا میشوند:
 

diff --git a/dist/description/description-kk.txt b/dist/description/description-kk.txt
@@ -0,0 +1,49 @@
+An efficient blocker: easy on memory and CPU footprint, and yet can load and enforce thousands more filters than other popular blockers out there.
+
+Illustrated overview of its efficiency: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
+
+Usage: The big power button in the popup is to permanently disable/enable uBlock for the current web site. It applies to the current web site only, it is not a global power button.
+
+***
+
+Flexible, it's more than an "ad blocker": it can also read and create filters from hosts files.
+
+Out of the box, these lists of filters are loaded and enforced:
+
+- EasyList
+- Peter Lowe’s Ad server list
+- EasyPrivacy
+- Malware domains
+
+More lists are available for you to select if you wish:
+
+- Fanboy’s Enhanced Tracking List
+- Dan Pollock’s hosts file
+- hpHosts’s Ad and tracking servers
+- MVPS HOSTS
+- Spam404
+- And many others
+
+Of course, the more filters enabled, the higher the memory footprint. Yet, even after adding Fanboy's two extra lists, hpHosts’s Ad and tracking servers, uBlock still has a lower memory footprint than other very popular blockers out there.
+
+Also, be aware that selecting some of these extra lists may lead to higher likelihood of web site breakage -- especially those lists which are normally used as hosts file.
+
+***
+
+Without the preset lists of filters, this extension is nothing. So if ever you really do want to contribute something, think about the people working hard to maintain the filter lists you are using, which were made available to use by all for free.
+
+***
+
+Еркін.
+Open source with public license (GPLv3)
+For users by users.
+
+Contributors @ Github: https://github.com/gorhill/uBlock/graphs/contributors
+Contributors @ Crowdin: https://crowdin.net/project/ublock
+
+***
+
+It's quite an early version, keep this in mind when you review.
+
+Project change log:
+https://github.com/gorhill/uBlock/releases
diff --git a/dist/description/description-no.txt → dist/description/description-nb.txt b/dist/description/description-no.txt → dist/description/description-nb.txt
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.14.22",
+    "version": "1.15.4",
 
     "commands": {
         "launch-element-zapper": {

diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2014-2017 The uBlock Origin authors
+    Copyright (C) 2014-2018 The uBlock Origin authors
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -384,32 +384,34 @@ vAPI.tabs.registerListeners = function() {
 
 /******************************************************************************/
 
+// Caller must be prepared to deal with nil tab argument.
+
+// https://code.google.com/p/chromium/issues/detail?id=410868#c8
+
 vAPI.tabs.get = function(tabId, callback) {
-    var onTabReady = function(tab) {
-        // https://code.google.com/p/chromium/issues/detail?id=410868#c8
-        if ( chrome.runtime.lastError ) {
-            /* noop */
-        }
-        // Caller must be prepared to deal with nil tab value
-        callback(tab);
-    };
+    if ( tabId === null ) {
+        chrome.tabs.query(
+            { active: true, currentWindow: true },
+            function(tabs) {
+                if ( chrome.runtime.lastError ) { /* noop */ }
+                callback(
+                    Array.isArray(tabs) && tabs.length !== 0 ? tabs[0] : null
+                );
+            }
+        );
+        return;
+    }
 
-    if ( tabId !== null ) {
-        tabId = toChromiumTabId(tabId);
-        if ( tabId === 0 ) {
-            onTabReady(null);
-        } else {
-            chrome.tabs.get(tabId, onTabReady);
-        }
+    tabId = toChromiumTabId(tabId);
+    if ( tabId === 0 ) {
+        callback(null);
         return;
     }
 
-    var onTabReceived = function(tabs) {
-        // https://code.google.com/p/chromium/issues/detail?id=410868#c8
-        void chrome.runtime.lastError;
-        callback(tabs[0]);
-    };
-    chrome.tabs.query({ active: true, currentWindow: true }, onTabReceived);
+    chrome.tabs.get(tabId, function(tab) {
+        if ( chrome.runtime.lastError ) { /* noop */ }
+        callback(tab);
+    });
 };
 
 /******************************************************************************/
@@ -579,11 +581,9 @@ vAPI.tabs.remove = function(tabId) {
 
 /******************************************************************************/
 
-vAPI.tabs.reload = function(tabId /*, flags*/) {
+vAPI.tabs.reload = function(tabId, bypassCache) {
     tabId = toChromiumTabId(tabId);
-    if ( tabId === 0 ) {
-        return;
-    }
+    if ( tabId === 0 ) { return; }
 
     var onReloaded = function() {
         // https://code.google.com/p/chromium/issues/detail?id=410868#c8
@@ -592,7 +592,11 @@ vAPI.tabs.reload = function(tabId /*, flags*/) {
         }
     };
 
-    chrome.tabs.reload(tabId, onReloaded);
+    chrome.tabs.reload(
+        tabId,
+        { bypassCache: bypassCache === true },
+        onReloaded
+    );
 };
 
 /******************************************************************************/
@@ -777,24 +781,23 @@ vAPI.messaging.onPortMessage = (function() {
     var toFramework = function(request, port, callback) {
         var sender = port && port.sender;
         if ( !sender ) { return; }
-        var tabId = sender.tab && sender.tab.id;
-        if ( !tabId ) { return; }
+        var tabId = sender.tab && sender.tab.id || undefined;
         var msg = request.msg,
             toPort;
         switch ( msg.what ) {
         case 'connectionAccepted':
         case 'connectionRefused':
             toPort = messaging.ports.get(msg.fromToken);
             if ( toPort !== undefined ) {
-                msg.tabId = tabId.toString();
+                msg.tabId = tabId && tabId.toString();
                 toPort.postMessage(request);
             } else {
                 msg.what = 'connectionBroken';
                 port.postMessage(request);
             }
             break;
         case 'connectionRequested':
-            msg.tabId = '' + tabId.toString();
+            msg.tabId = tabId && tabId.toString();
             for ( toPort of messaging.ports.values() ) {
                 toPort.postMessage(request);
             }
@@ -806,14 +809,15 @@ vAPI.messaging.onPortMessage = (function() {
                 port.name === msg.fromToken ? msg.toToken : msg.fromToken
             );
             if ( toPort !== undefined ) {
-                msg.tabId = tabId.toString();
+                msg.tabId = tabId && tabId.toString();
                 toPort.postMessage(request);
             } else {
                 msg.what = 'connectionBroken';
                 port.postMessage(request);
             }
             break;
         case 'userCSS':
+            if ( tabId === undefined ) { break; }
             var details = {
                 code: undefined,
                 frameId: sender.frameId,

diff --git a/platform/edge/manifest.json b/platform/edge/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.14.24",
+    "version": "1.15.4",
 
     "commands": {
         "launch-element-zapper": {