Merge pull request gorhill#28 from gorhill/master

Re-sync with uBo master

Author: pes10k

assets/resources/scriptlets.js

@@ -613,16 +613,21 @@
         apply: function(target, thisArg, args) {
             let proceed = true;
             try {
-                const url = args[0] instanceof self.Request
-                    ? args[0].url
-                    : args[0];
-                const props = new Map([ [ 'url', url ] ]);
-                const init = args[1];
-                if ( init instanceof Object ) {
-                    for ( const prop in init ) {
-                        if ( init.hasOwnProperty(prop) === false ) { continue; }
-                        props.set( prop, init[prop]);
+                let details;
+                if ( args[0] instanceof self.Request ) {
+                    details = args[0];
+                } else {
+                    details = Object.assign({ url: args[0] }, args[1]);
+                }
+                const props = new Map();
+                for ( const prop in details ) {
+                    let v = details[prop];
+                    if ( typeof v !== 'string' ) {
+                        try { v = JSON.stringify(v); }
+                        catch(ex) { }
                     }
+                    if ( typeof v !== 'string' ) { continue; }
+                    props.set(prop, v);
                 }
                 if ( log !== undefined ) {
                     const out = Array.from(props)

dist/firefox/updates.json

@@ -3,9 +3,9 @@
   "[email protected]": {
    "updates": [
     {
-     "version": "1.31.3.14",
+     "version": "1.32.5.5",
      "browser_specific_settings": { "gecko": { "strict_min_version": "55" } },
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.31.3b14/uBlock0_1.31.3b14.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.32.5b5/uBlock0_1.32.5b5.firefox.signed.xpi"
     }
    ]
   }

dist/version

@@ -1 +1 @@
-1.31.3.14
+1.32.5.5

platform/chromium/managed_storage.json

@@ -3,9 +3,41 @@
   "type": "object",
   "properties": {
     "adminSettings": {
-      "title": "A valid JSON string compliant with uBO's backup format.",
+      "title": "A valid JSON string compliant with uBO's backup format",
       "description": "All entries present will overwrite local settings.",
       "type": "string"
+    },
+    "toSet": {
+      "title": "Settings to overwrite at launch time",
+      "type": "object",
+      "properties": {
+        "hiddenSettings": {
+          "title": "A list of [name,value] pairs to populate hidden settings",
+          "type": "array",
+          "items": {
+            "title": "A [name,value] pair",
+            "type": "array",
+            "items": { "type": "string" }
+          }
+        },
+        "trustedSiteDirectives": {
+          "title": "A list of trusted-site directives",
+          "type": "array",
+          "items": { "type": "string" }
+        }
+      }
+    },
+    "toAdd": {
+      "title": "Settings to add at launch time",
+      "type": "object",
+      "properties": {
+        "trustedSiteDirectives": {
+          "title": "A list of trusted-site directives",
+          "description": "Trusted-site directives to always add at launch time.",
+          "type": "array",
+          "items": { "type": "string" }
+        }
+      }
     }
   }
 }

platform/chromium/vapi-background.js

@@ -1417,21 +1417,22 @@ vAPI.commands = browser.commands;
 vAPI.adminStorage = (( ) => {
     if ( webext.storage.managed instanceof Object === false ) {
         return {
-            getItem: function() {
+            get: function() {
                 return Promise.resolve();
             },
         };
     }
     return {
-        getItem: async function(key) {
+        get: async function(key) {
             let bin;
             try {
                 bin = await webext.storage.managed.get(key);
             } catch(ex) {
             }
-            if ( bin instanceof Object ) {
+            if ( typeof key === 'string' && bin instanceof Object ) {
                 return bin[key];
             }
+            return bin;
         }
     };
 })();

src/1p-filters.html

@@ -49,6 +49,7 @@
 <script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
 <script src="lib/codemirror/addon/search/searchcursor.js"></script>
 <script src="lib/codemirror/addon/selection/active-line.js"></script>
+<script src="lib/regexanalyzer/regex.js"></script>
 
 <script src="js/codemirror/search.js"></script>
 <script src="js/codemirror/search-thread.js"></script>

src/_locales/ar/messages.json

@@ -1028,7 +1028,7 @@
     "description": ""
   },
   "contextMenuBlockElementInFrame": {
-    "message": "Block element in frame...",
+    "message": "احظر العنصر في البرواز...",
     "description": "An entry in the browser's contextual menu"
   },
   "contextMenuTemporarilyAllowLargeMediaElements": {

src/_locales/id/messages.json

@@ -912,7 +912,7 @@
     "description": "No longer used"
   },
   "subscribeButton": {
-    "message": "Langganan",
+    "message": "Berlangganan",
     "description": "For the button used to subscribe to a filter list"
   },
   "elapsedOneMinuteAgo": {

src/_locales/oc/messages.json

@@ -188,7 +188,7 @@
     "description": "Caption for the no-large-media per-site switch"
   },
   "popupNoCosmeticFiltering_v2": {
-    "message": "Cosmetic filtering",
+    "message": "Filtres cosmetics",
     "description": "Caption for the no-cosmetic-filtering per-site switch"
   },
   "popupNoRemoteFonts_v2": {
@@ -232,7 +232,7 @@
     "description": ""
   },
   "popup3pAnyRulePrompt": {
-    "message": "3rd-party",
+    "message": "Tèrça partida",
     "description": ""
   },
   "popup3pPassiveRulePrompt": {
@@ -360,7 +360,7 @@
     "description": ""
   },
   "settingsNoRemoteFontsPrompt": {
-    "message": "Block remote fonts",
+    "message": "Blocar las poliças distantas",
     "description": ""
   },
   "settingsNoScriptingPrompt": {
@@ -372,11 +372,11 @@
     "description": "background information: https://github.com/gorhill/uBlock/issues/3150"
   },
   "settingsLastRestorePrompt": {
-    "message": "Last restore:",
+    "message": "Darrièra restauracion :",
     "description": "English: Last restore:"
   },
   "settingsLastBackupPrompt": {
-    "message": "Last backup:",
+    "message": "Darrièra salvagarda :",
     "description": "English: Last backup:"
   },
   "3pListsOfBlockedHostsPrompt": {
@@ -428,15 +428,15 @@
     "description": "Header for the uBlock filters section in 'Filter lists pane'"
   },
   "3pGroupAds": {
-    "message": "Ads",
+    "message": "Publicitats",
     "description": "English: Ads"
   },
   "3pGroupPrivacy": {
-    "message": "Privacy",
+    "message": "Confidencialitat",
     "description": "English: Privacy"
   },
   "3pGroupMalware": {
-    "message": "Malware domains",
+    "message": "Domenis malfasents",
     "description": "English: Malware domains"
   },
   "3pGroupAnnoyances": {
@@ -552,19 +552,19 @@
     "description": "English: dynamic rule syntax and full documentation."
   },
   "rulesSort": {
-    "message": "Sort:",
+    "message": "Triar :",
     "description": "English: label for sort option."
   },
   "rulesSortByType": {
     "message": "Rule type",
     "description": "English: a sort option for list of rules."
   },
   "rulesSortBySource": {
-    "message": "Source",
+    "message": "Font",
     "description": "English: a sort option for list of rules."
   },
   "rulesSortByDestination": {
-    "message": "Destination",
+    "message": "Destinacion",
     "description": "English: a sort option for list of rules."
   },
   "whitelistPrompt": {
@@ -576,7 +576,7 @@
     "description": "English: Import and append"
   },
   "whitelistExport": {
-    "message": "Export",
+    "message": "Exportar",
     "description": "English: Export"
   },
   "whitelistExportFilename": {
@@ -600,7 +600,7 @@
     "description": "English: URL"
   },
   "logRequestsHeaderFilter": {
-    "message": "Filter",
+    "message": "Filtre",
     "description": "English: Filter"
   },
   "logAll": {
@@ -692,7 +692,7 @@
     "description": "Label to identify a filter field"
   },
   "loggerEntryDetailsFilterList": {
-    "message": "Filter list",
+    "message": "Lista de filtre",
     "description": "Label to identify a filter list field"
   },
   "loggerEntryDetailsRule": {
@@ -820,11 +820,11 @@
     "description": "A label for the partyness column"
   },
   "loggerExportFormatList": {
-    "message": "List",
+    "message": "Lista",
     "description": "Label for radio-button to pick export format"
   },
   "loggerExportFormatTable": {
-    "message": "Table",
+    "message": "Tablèu",
     "description": "Label for radio-button to pick export format"
   },
   "loggerExportEncodePlain": {
@@ -844,27 +844,27 @@
     "description": "English: project' wiki on GitHub"
   },
   "aboutSupport": {
-    "message": "Support",
+    "message": "Assisténcia",
     "description": "A link for where to get support"
   },
   "aboutIssues": {
-    "message": "Issue tracker",
+    "message": "Seguidor d’avarias",
     "description": "Text for a link to official issue tracker"
   },
   "aboutCode": {
-    "message": "Source code (GPLv3)",
+    "message": "Còdi font (GPLv3)",
     "description": "English: Source code (GPLv3)"
   },
   "aboutContributors": {
     "message": "Contributors",
     "description": "English: Contributors"
   },
   "aboutSourceCode": {
-    "message": "Source code",
+    "message": "Còdi font",
     "description": "Link text to source code repo"
   },
   "aboutTranslations": {
-    "message": "Translations",
+    "message": "Traduccions",
     "description": "Link text to translations repo"
   },
   "aboutFilterLists": {
@@ -916,27 +916,27 @@
     "description": "For the button used to subscribe to a filter list"
   },
   "elapsedOneMinuteAgo": {
-    "message": "a minute ago",
+    "message": "fa una minuta",
     "description": "English: a minute ago"
   },
   "elapsedManyMinutesAgo": {
-    "message": "{{value}} minutes ago",
+    "message": "fa {{value}} minutas",
     "description": "English: {{value}} minutes ago"
   },
   "elapsedOneHourAgo": {
-    "message": "an hour ago",
+    "message": "fa una ora",
     "description": "English: an hour ago"
   },
   "elapsedManyHoursAgo": {
-    "message": "{{value}} hours ago",
+    "message": "fa {{value}} oras",
     "description": "English: {{value}} hours ago"
   },
   "elapsedOneDayAgo": {
-    "message": "a day ago",
+    "message": "a un jorn",
     "description": "English: a day ago"
   },
   "elapsedManyDaysAgo": {
-    "message": "{{value}} days ago",
+    "message": "fa {{value}} jorns",
     "description": "English: {{value}} days ago"
   },
   "showDashboardButton": {
@@ -1012,7 +1012,7 @@
     "description": "A warning to users at the top of 'Advanced settings' page"
   },
   "genericSubmit": {
-    "message": "Submit",
+    "message": "Mandar",
     "description": "for generic 'Submit' buttons"
   },
   "genericApplyChanges": {
@@ -1036,15 +1036,15 @@
     "description": "A context menu entry, present when large media elements have been blocked on the current site"
   },
   "shortcutCapturePlaceholder": {
-    "message": "Type a shortcut",
+    "message": "Picar un acorchi",
     "description": "Placeholder string for input field used to capture a keyboard shortcut"
   },
   "genericMergeViewScrollLock": {
     "message": "Toggle locked scrolling",
     "description": "Tooltip for the button used to lock scrolling between the views in the 'My rules' pane"
   },
   "genericCopyToClipboard": {
-    "message": "Copy to clipboard",
+    "message": "Copiar al quichapapièrs",
     "description": "Label for buttons used to copy something to the clipboard"
   },
   "toggleBlockingProfile": {
@@ -1060,19 +1060,19 @@
     "description": " In Setting pane, renders as (example): Storage used: 13.2 MB"
   },
   "KB": {
-    "message": "KB",
+    "message": "Ko",
     "description": "short for 'kilobytes'"
   },
   "MB": {
-    "message": "MB",
+    "message": "Mo",
     "description": "short for 'megabytes'"
   },
   "GB": {
-    "message": "GB",
+    "message": "Go",
     "description": "short for 'gigabytes'"
   },
   "clickToLoad": {
-    "message": "Click to load",
+    "message": "Clicatz per cargar",
     "description": "Message used in frame placeholders"
   },
   "dummy": {