Merge pull request gorhill#22 from gorhill/master

Re-sync with uBo master
ryanbr · Oct 19, 2020 · d742ec7 · d742ec7
2 parents ba3cf1d + 2546f39
commit d742ec7
Show file tree

Hide file tree

Showing 98 changed files with 1,153 additions and 520 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -147,7 +147,7 @@
 		"group": "malware",
 		"title": "Online Malicious URL Blocklist",
 		"contentURL": [
-			"https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt",
+			"https://curben.gitlab.io/malware-filter/urlhaus-filter-online.txt",
 			"https://raw.githubusercontent.com/curbengh/urlhaus-filter/master/urlhaus-filter-online.txt",
 			"assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt"
 		],
@@ -156,7 +156,7 @@
 			"https://gitcdn.xyz/repo/curbengh/urlhaus-filter/master/urlhaus-filter-online.txt",
 			"https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter/urlhaus-filter-online.txt",
 			"https://raw.githubusercontent.com/curbengh/urlhaus-filter/master/urlhaus-filter-online.txt",
-			"https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt"
+			"https://curben.gitlab.io/malware-filter/urlhaus-filter-online.txt"
 		],
 		"supportURL": "https://gitlab.com/curben/urlhaus-filter#urlhaus-malicious-url-blocklist"
 	},

diff --git a/assets/resources/scriptlets.js b/assets/resources/scriptlets.js
@@ -741,7 +741,7 @@
     };
     // https://github.com/uBlockOrigin/uBlock-issues/issues/156
     //   Support multiple trappers for the same property.
-    const trapProp = function(owner, prop, handler) {
+    const trapProp = function(owner, prop, configurable, handler) {
         if ( handler.init(owner[prop]) === false ) { return; }
         const odesc = Object.getOwnPropertyDescriptor(owner, prop);
         let prevGetter, prevSetter;
@@ -754,7 +754,7 @@
             }
         }
         Object.defineProperty(owner, prop, {
-            configurable: true,
+            configurable,
             get() {
                 if ( prevGetter !== undefined ) {
                     prevGetter();
@@ -772,7 +772,7 @@
     const trapChain = function(owner, chain) {
         const pos = chain.indexOf('.');
         if ( pos === -1 ) {
-            trapProp(owner, chain, {
+            trapProp(owner, chain, false, {
                 v: undefined,
                 init: function(v) {
                     if ( mustAbort(v) ) { return false; }
@@ -798,7 +798,7 @@
             trapChain(v, chain);
             return;
         }
-        trapProp(owner, prop, {
+        trapProp(owner, prop, true, {
             v: undefined,
             init: function(v) {
                 this.v = v;
@@ -808,6 +808,7 @@
                 return this.v;
             },
             setter: function(a) {
+                if ( a === this.v ) { return; }
                 this.v = a;
                 if ( a instanceof Object ) {
                     trapChain(a, chain);

diff --git a/dist/description/description-de.txt b/dist/description/description-de.txt
@@ -1,4 +1,4 @@
-Ein effizienter Blocker: Geringer Speicherbedarf und niedrige CPU-Belastung - und dennoch werden Tausende an Filtern mehr angewendet als bei anderen populären Blockern.
+Ein effizienter Blocker: Geringer Speicherbedarf und niedrige CPU-Belastung - und dennoch werden tausende Filter mehr angewendet als bei anderen beliebten Blockern.
 
 Ein illustrierter Überblick über seine Effizienz: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 
@@ -30,7 +30,7 @@ Bedenke allerdings, dass durch die Wahl zusätzlicher Listen die Wahrscheinlichk
 
 
 
-  Wenn du etwas beitragen möchtest, dann denke an die Menschen, die hart dafür arbeiten, die von dir benutzten Filterlisten zu pflegen, und diese für uns alle frei verfügbar gemacht haben.
+  Wenn du etwas beitragen möchtest, dann denke an die Menschen, die hart dafür arbeiten, die von dir benutzten Filterlisten zu pflegen und diese für uns alle frei verfügbar gemacht haben.
 
 
 

diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
@@ -3,10 +3,10 @@
   "[email protected]": {
    "updates": [
     {
-     "version": "1.30.1.5",
+     "version": "1.30.5.7",
      "browser_specific_settings": { "gecko": { "strict_min_version": "55" } },
-     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.30.1b5",
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.30.1b5/uBlock0_1.30.1b5.firefox.signed.xpi"
+     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.30.5b7",
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.30.5b7/uBlock0_1.30.5b7.firefox.signed.xpi"
     }
    ]
   }

diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.30.1.5
+1.30.5.7
diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
@@ -1435,27 +1435,10 @@ vAPI.localStorage = {
         if ( this.cache instanceof Promise ) { return this.cache; }
         if ( this.cache instanceof Object ) { return this.cache; }
         this.cache = webext.storage.local.get('localStorage').then(bin => {
-            this.cache = undefined;
-            try {
-                if (
-                    bin instanceof Object === false ||
-                    bin.localStorage instanceof Object === false
-                ) {
-                    this.cache = {};
-                    const ls = self.localStorage;
-                    for ( let i = 0; i < ls.length; i++ ) {
-                        const key = ls.key(i);
-                        this.cache[key] = ls.getItem(key);
-                    }
-                    webext.storage.local.set({ localStorage: this.cache });
-                } else {
-                    this.cache = bin.localStorage;
-                }
-            } catch(ex) {
-            }
-            if ( this.cache instanceof Object === false ) {
-                this.cache = {};
-            }
+            this.cache = bin instanceof Object &&
+                bin.localStorage instanceof Object
+                    ? bin.localStorage
+                    : {};
         });
         return this.cache;
     },

diff --git a/platform/firefox/vapi-webrequest.js b/platform/firefox/vapi-webrequest.js
@@ -125,19 +125,21 @@
             this.cnameFlushTime = Date.now() + this.cnameMaxTTL * 60000;
             // https://github.com/uBlockOrigin/uBlock-issues/issues/911
             //   Install/remove proxy detector.
-            const wrohr = browser.webRequest.onHeadersReceived;
-            if ( cnameUncloak === false || cnameUncloakProxied ) {
-                if ( wrohr.hasListener(proxyDetector) ) {
-                    wrohr.removeListener(proxyDetector);
+            if ( vAPI.webextFlavor.major < 80 ) {
+                const wrohr = browser.webRequest.onHeadersReceived;
+                if ( cnameUncloak === false || cnameUncloakProxied ) {
+                    if ( wrohr.hasListener(proxyDetector) ) {
+                        wrohr.removeListener(proxyDetector);
+                    }
+                } else if ( wrohr.hasListener(proxyDetector) === false ) {
+                    wrohr.addListener(
+                        proxyDetector,
+                        { urls: [ '*://*/*' ] },
+                        [ 'blocking' ]
+                    );
                 }
-            } else if ( wrohr.hasListener(proxyDetector) === false ) {
-                wrohr.addListener(
-                    proxyDetector,
-                    { urls: [ '*://*/*' ] },
-                    [ 'blocking' ]
-                );
+                proxyDetectorTryCount = 32;
             }
-            proxyDetectorTryCount = 32;
         }
         normalizeDetails(details) {
             if ( mustPunycode && !reAsciiHostname.test(details.url) ) {

diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json
@@ -648,7 +648,7 @@
     "description": "Tooltip for the row filterer button in the logger page"
   },
   "logFilterPrompt": {
-    "message": "فلتر سجل الإدخالات",
+    "message": "رشّح محتوى السجل",
     "description": "Placeholder string for logger output filtering input field"
   },
   "loggerRowFiltererBuiltinTip": {
@@ -1063,6 +1063,10 @@
     "message": "جيغا بايت",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "اضغط للتحميل",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "يجب أن يكون هذا الإدخال آخر واحد",
     "description": "so we dont need to deal with comma for last entry"

diff --git a/src/_locales/az/messages.json b/src/_locales/az/messages.json
@@ -12,15 +12,15 @@
     "description": "English: uBlock₀ — Dashboard"
   },
   "dashboardUnsavedWarning": {
-    "message": "Diqqət! Yadda saxlamadığınız dəyişikliklər var",
+    "message": "Xəbərdarlıq! Saxlamadığınız dəyişikliklər var",
     "description": "A warning in the dashboard when navigating away from unsaved changes"
   },
   "dashboardUnsavedWarningStay": {
     "message": "Qal",
     "description": "Label for button to prevent navigating away from unsaved changes"
   },
   "dashboardUnsavedWarningIgnore": {
-    "message": "Nəzərə alma",
+    "message": "Əhəmiyyət vermə",
     "description": "Label for button to ignore unsaved changes"
   },
   "settingsPageName": {
@@ -40,15 +40,15 @@
     "description": "appears as tab name in dashboard"
   },
   "whitelistPageName": {
-    "message": "İstisnalar",
+    "message": "Etibarlı saytlar",
     "description": "appears as tab name in dashboard"
   },
   "shortcutsPageName": {
     "message": "Qısayollar",
     "description": "appears as tab name in dashboard"
   },
   "statsPageName": {
-    "message": "uBlock₀ — Qeydiyyatçı",
+    "message": "uBlock₀ — Jurnal",
     "description": "Title for the logger window"
   },
   "aboutPageName": {
@@ -60,19 +60,19 @@
     "description": "Title for the asset viewer page"
   },
   "advancedSettingsPageName": {
-    "message": "Əlavə parametrlər",
+    "message": "Qabaqcıl tənzimləmələr",
     "description": "Title for the advanced settings page"
   },
   "popupPowerSwitchInfo": {
-    "message": "Klik: Bu saytda uBlock₀-u işə sal/dayandır.\n\nCtrl+klik: Yalnız bu səhifədə uBlock₀-u dayandır.",
+    "message": "Klikləmə: Bu sayt üçün uBlock₀-u fəallaşdır/sıradan çıxart.\n\nCtrl+klikləmə: Yalnız bu səhifə üçün uBlock₀-u sıradan çıxart.",
     "description": "English: Click: disable/enable uBlock₀ for this site.\n\nCtrl+click: disable uBlock₀ only on this page."
   },
   "popupPowerSwitchInfo1": {
-    "message": "Bu saytda uBlock₀-u dayandırmaq üçün düyməyə basın.\n\nYalnız bu səhifədə uBlock₀-u dayandırmaq üçün Ctrl və düyməyə basın.",
+    "message": "Bu sayt üçün uBlock₀-u sıradan çıxartmaq üçün klikləyin.\n\nYalnız bu səhifə üçün uBlock₀-u sıradan çıxartmaq üçün Ctrl+klikləyin.",
     "description": "Message to be read by screen readers"
   },
   "popupPowerSwitchInfo2": {
-    "message": "Bu saytda uBlock₀-u işə salmaq üçün düyməyə basın.",
+    "message": "Bu saytda uBlock₀-u fəallaşdırmaq üçün klikləyin.",
     "description": "Message to be read by screen readers"
   },
   "popupBlockedRequestPrompt": {
@@ -92,7 +92,7 @@
     "description": "English: since install"
   },
   "popupOr": {
-    "message": "yaxud",
+    "message": "və ya",
     "description": "English: or"
   },
   "popupBlockedOnThisPage_v2": {
@@ -104,7 +104,7 @@
     "description": "For the new mobile-friendly popup design"
   },
   "popupDomainsConnected_v2": {
-    "message": "Qoşulmuş domenlər",
+    "message": "Bağlantı qurulmuş domenlər",
     "description": "For the new mobile-friendly popup design"
   },
   "popupTipDashboard": {
@@ -120,23 +120,23 @@
     "description": "English: Enter element picker mode"
   },
   "popupTipLog": {
-    "message": "Loggeri aç",
+    "message": "Jurnalı aç",
     "description": "Tooltip used for the logger icon in the panel"
   },
   "popupTipNoPopups": {
-    "message": "Bu saytda peyda olan bütün pəncərələrin əngəllənməsini işə sal/dayandır",
+    "message": "Bu sayt üçün bütün açılan pəncələri aç/bağla",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups1": {
-    "message": "Bu saytda peyda olan bütün pəncərələri əngəlləmək üçün düyməyə basın",
+    "message": "Bu saytda bütün açılan pəncərələri əngəlləmək üçün kliklə",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups2": {
-    "message": "Bu saytda peyda olan bütün pəncərələri daha əngəlləməmək üçün düyməyə basın",
+    "message": "Bu saytdakı bütün açılan pəncələri artıq əngəlləməmək üçün kliklə",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoLargeMedia": {
-    "message": "Bu saytda böyük media elemetlərinin əngəllənməsini işə sal/dayandır",
+    "message": "Bu saytda böyük media elemetlərini əngəlləməyi aç/bağla",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia1": {
@@ -172,7 +172,7 @@
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoScripting1": {
-    "message": "Bu saytda JavaScript-i əngəlləmək üçün düyməyə basın",
+    "message": "Bu saytda JavaScript-i sıradan çıxartmaq üçün kliklə",
     "description": "Tooltip for the no-scripting per-site switch"
   },
   "popupTipNoScripting2": {
@@ -216,7 +216,7 @@
     "description": "Tooltip when hovering the top-most cell of the local-rules column."
   },
   "popupTipSaveRules": {
-    "message": "Dəyişiklikləri daimi etmək üçün düyməyə basın.",
+    "message": "Dəyişiklikləri daimi etmək üçün klikləyin.",
     "description": "Tooltip when hovering over the padlock in the dynamic filtering pane."
   },
   "popupTipRevertRules": {
@@ -908,7 +908,7 @@
     "description": "No longer used"
   },
   "subscribeButton": {
-    "message": "Subscribe",
+    "message": "Abunə ol",
     "description": "For the button used to subscribe to a filter list"
   },
   "elapsedOneMinuteAgo": {
@@ -1036,19 +1036,19 @@
     "description": "Tooltip for the button used to lock scrolling between the views in the 'My rules' pane"
   },
   "genericCopyToClipboard": {
-    "message": "Mübadilə buferinə kopyala",
+    "message": "Lövhəyə kopyala",
     "description": "Label for buttons used to copy something to the clipboard"
   },
   "toggleBlockingProfile": {
-    "message": "Əngəlləmə profilini işə sal/söndür",
+    "message": "Əngəlləmə profilini aç/bağla",
     "description": "Label for keyboard shortcut used to toggle blocking profile"
   },
   "relaxBlockingMode": {
-    "message": "Zəif əngəlləmə rejimi",
+    "message": "Əngəlləmə rejimini yüngülləşdir",
     "description": "Label for keyboard shortcut used to relax blocking mode (meant to replace 'Toggle blocking profile')"
   },
   "storageUsed": {
-    "message": "İstifadə olunan yer: {{value}} {{unit}}",
+    "message": "İstifadə olunan anbar: {{value}} {{unit}}",
     "description": " In Setting pane, renders as (example): Storage used: 13.2 MB"
   },
   "KB": {
@@ -1063,6 +1063,10 @@
     "message": "GB",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "Yükləmək üçün kliklə",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "This entry must be the last one",
     "description": "so we dont need to deal with comma for last entry"

diff --git a/src/_locales/bg/messages.json b/src/_locales/bg/messages.json
@@ -1063,6 +1063,10 @@
     "message": "ГБ",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "Щракнете, за да се зареди",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "Това поле трябва да бъде последното",
     "description": "so we dont need to deal with comma for last entry"

diff --git a/src/_locales/bn/messages.json b/src/_locales/bn/messages.json
@@ -1063,6 +1063,10 @@
     "message": "গিগাবাইট",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "Click to load",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "This entry must be the last one",
     "description": "so we dont need to deal with comma for last entry"

diff --git a/src/_locales/bs/messages.json b/src/_locales/bs/messages.json
@@ -1063,6 +1063,10 @@
     "message": "GB",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "Click to load",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "This entry must be the last one",
     "description": "so we dont need to deal with comma for last entry"

diff --git a/src/_locales/ca/messages.json b/src/_locales/ca/messages.json
@@ -1063,6 +1063,10 @@
     "message": "GB",
     "description": "short for 'gigabytes'"
   },
+  "clickToLoad": {
+    "message": "Clic per carregar",
+    "description": "Message used in frame placeholders"
+  },
   "dummy": {
     "message": "Aquesta entrada ha de ser l'última",
     "description": "so we dont need to deal with comma for last entry"