From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../webcompat/about-compat/aboutCompat.js | 2 +- browser/extensions/webcompat/data/shims.js | 4 ++ browser/extensions/webcompat/data/ua_overrides.js | 80 +++++++++++----------- .../webcompat/experiment-apis/appConstants.js | 2 +- .../experiment-apis/systemManufacturer.js | 2 +- .../experiment-apis/trackingProtection.js | 4 +- .../js/bug1769762-tiktok.com-plugins-shim.js | 2 +- .../injections/js/bug1855014-eksiseyler.com.js | 2 +- .../extensions/webcompat/lib/custom_functions.js | 2 +- browser/extensions/webcompat/lib/shims.js | 2 +- browser/extensions/webcompat/lib/ua_overrides.js | 2 +- browser/extensions/webcompat/manifest.json | 2 +- browser/extensions/webcompat/shims/eluminate.js | 2 +- browser/extensions/webcompat/shims/google-ima.js | 14 ++-- .../webcompat/shims/rambler-authenticator.js | 2 +- browser/extensions/webcompat/shims/webtrends.js | 2 +- 16 files changed, 65 insertions(+), 61 deletions(-) (limited to 'browser/extensions/webcompat') diff --git a/browser/extensions/webcompat/about-compat/aboutCompat.js b/browser/extensions/webcompat/about-compat/aboutCompat.js index edf467edeb..118806de87 100644 --- a/browser/extensions/webcompat/about-compat/aboutCompat.js +++ b/browser/extensions/webcompat/about-compat/aboutCompat.js @@ -14,7 +14,7 @@ const portToAddon = (function () { function connect() { port = browser.runtime.connect({ name: "AboutCompatTab" }); port.onMessage.addListener(onMessageFromAddon); - port.onDisconnect.addListener(e => { + port.onDisconnect.addListener(() => { port = undefined; }); } diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js index f26ad96d04..ab7234c217 100644 --- a/browser/extensions/webcompat/data/shims.js +++ b/browser/extensions/webcompat/data/shims.js @@ -673,6 +673,8 @@ const AVAILABLE_SHIMS = [ ["*://teams.microsoft.com/*", "*://login.microsoftonline.com/*"], ["*://*.teams.microsoft.us/*", "*://login.microsoftonline.us/*"], ["*://www.msn.com/*", "*://login.microsoftonline.com/*"], + ["*://support.microsoft.com/*", "*://login.microsoftonline.com/*"], + ["*://answers.microsoft.com/*", "*://login.microsoftonline.com/*"], ], contentScripts: [ { @@ -682,6 +684,8 @@ const AVAILABLE_SHIMS = [ "*://teams.microsoft.com/*", "*://*.teams.microsoft.us/*", "*://www.msn.com/*", + "*://support.microsoft.com/*", + "*://answers.microsoft.com/*", ], runAt: "document_start", }, diff --git a/browser/extensions/webcompat/data/ua_overrides.js b/browser/extensions/webcompat/data/ua_overrides.js index 3645e962f0..22124c4f23 100644 --- a/browser/extensions/webcompat/data/ua_overrides.js +++ b/browser/extensions/webcompat/data/ua_overrides.js @@ -225,7 +225,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1574564", config: { matches: ["*://*.ceskatelevize.cz/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -302,7 +302,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1622063", config: { matches: ["*://wp1-ext.usps.gov/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -429,7 +429,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1719859", config: { matches: ["*://*.saxoinvestor.fr/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -546,7 +546,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1753461", config: { matches: ["*://serieson.naver.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36"; }, }, @@ -565,7 +565,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1771200", config: { matches: ["*://*.animalplanet.com/video/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -584,7 +584,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1779059", config: { matches: ["*://member-m.lazada.co.id/address/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -603,7 +603,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1778168", config: { matches: ["*://watch.antennaplus.gr/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA({ desktopOS: "nonLinux", }); @@ -623,7 +623,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1776897", config: { matches: ["*://www.edencast.fr/zoomcast*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -641,7 +641,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1784361", config: { matches: ["*://*.coldwellbankerhomes.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -678,7 +678,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1819702", config: { matches: ["*://*.feelgoodcontacts.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -694,7 +694,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1823966", config: { matches: ["*://*.elearning.dmv.ca.gov/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -710,7 +710,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.admissions.nid.edu/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -726,7 +726,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.bankmandiri.co.id/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -742,7 +742,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.frankfred.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -758,7 +758,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://mobile.onvue.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -774,7 +774,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.avizia.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -790,7 +790,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://www.yourtexasbenefits.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -806,7 +806,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://www.free4talk.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -822,7 +822,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://watch.indee.tv/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -838,7 +838,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://viewer-ebook.books.com.tw/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -854,7 +854,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://jelly.jd.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -870,7 +870,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.kt.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -886,7 +886,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://*.oirsa.org/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -902,7 +902,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1827678", config: { matches: ["*://onp.cloud.waterloo.ca/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -927,7 +927,7 @@ const AVAILABLE_UA_OVERRIDES = [ "*://*.yebocasino.co.za/*", // 88409 "*://*.yabbycasino.com/*", // 108025 ], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -943,7 +943,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1830821", config: { matches: ["*://*.webcartop.jp/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -959,7 +959,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1830821", config: { matches: ["*://enjoy.point.auone.jp/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -976,7 +976,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1836109", config: { matches: ["*://watch.tonton.com.my/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -993,7 +993,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1836112", config: { matches: ["*://www.capcut.cn/editor*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1078,7 +1078,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1836182", config: { matches: ["*://*.flatsatshadowglen.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1097,7 +1097,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1849018", config: { matches: ["*://*.carefirst.com/myaccount*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1115,7 +1115,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1850455", config: { matches: ["*://*.frontgate.com/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1134,7 +1134,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1855088", config: { matches: ["*://hrmis2.eghrmis.gov.my/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1152,7 +1152,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1855102", config: { matches: ["*://my.southerncross.co.nz/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1197,7 +1197,7 @@ const AVAILABLE_UA_OVERRIDES = [ "*://magazine.kruidvat.be/*", "*://folder.kruidvat.nl/*", ], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1215,7 +1215,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1864999", config: { matches: ["*://*.autotrader.ca/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1234,7 +1234,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1865000", config: { matches: ["*://*.bmo.com/main/personal/*/getting-started/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1252,7 +1252,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1865004", config: { matches: ["*://*.digimart.net/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1270,7 +1270,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1865007", config: { matches: ["*://*.circle.ms/*"], - uaTransformer: originalUA => { + uaTransformer: () => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, @@ -1288,7 +1288,7 @@ const AVAILABLE_UA_OVERRIDES = [ bug: "1884779", config: { matches: ["*://*.memurlar.net/*"], - uaTransformer: originalUA => { + uaTransformer: _originalUA => { return UAHelpers.getDeviceAppropriateChromeUA(); }, }, diff --git a/browser/extensions/webcompat/experiment-apis/appConstants.js b/browser/extensions/webcompat/experiment-apis/appConstants.js index 2869f299a4..13900b9890 100644 --- a/browser/extensions/webcompat/experiment-apis/appConstants.js +++ b/browser/extensions/webcompat/experiment-apis/appConstants.js @@ -7,7 +7,7 @@ /* global AppConstants, ExtensionAPI, XPCOMUtils */ this.appConstants = class extends ExtensionAPI { - getAPI(context) { + getAPI() { return { appConstants: { getReleaseBranch: () => { diff --git a/browser/extensions/webcompat/experiment-apis/systemManufacturer.js b/browser/extensions/webcompat/experiment-apis/systemManufacturer.js index b7dc68415c..033e49daaa 100644 --- a/browser/extensions/webcompat/experiment-apis/systemManufacturer.js +++ b/browser/extensions/webcompat/experiment-apis/systemManufacturer.js @@ -7,7 +7,7 @@ /* global ExtensionAPI, Services, XPCOMUtils */ this.systemManufacturer = class extends ExtensionAPI { - getAPI(context) { + getAPI() { return { systemManufacturer: { getManufacturer() { diff --git a/browser/extensions/webcompat/experiment-apis/trackingProtection.js b/browser/extensions/webcompat/experiment-apis/trackingProtection.js index 0f5d9a4233..22a8a4bbea 100644 --- a/browser/extensions/webcompat/experiment-apis/trackingProtection.js +++ b/browser/extensions/webcompat/experiment-apis/trackingProtection.js @@ -63,7 +63,7 @@ class Manager { "@mozilla.org/url-classifier/channel-classifier-service;1" ].getService(Ci.nsIChannelClassifierService); this._classifierObserver = {}; - this._classifierObserver.observe = (subject, topic, data) => { + this._classifierObserver.observe = (subject, topic) => { switch (topic) { case "http-on-stop-request": { const { channelId } = subject.QueryInterface(Ci.nsIIdentChannel); @@ -163,7 +163,7 @@ function updateDFPIStatus() { } this.trackingProtection = class extends ExtensionAPI { - onShutdown(isAppShutdown) { + onShutdown() { if (manager) { manager.stop(); } diff --git a/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js b/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js index 7383a4e567..6372cd58e0 100644 --- a/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js +++ b/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js @@ -31,5 +31,5 @@ Object.defineProperty(navigator.wrappedJSObject, "plugins", { get: exportFunction(function () { return pluginsArray; }, window), - set: exportFunction(function (val) {}, window), + set: exportFunction(function () {}, window), }); diff --git a/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js b/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js index 9c22c762a9..87f981f0f1 100644 --- a/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js +++ b/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js @@ -23,5 +23,5 @@ Object.defineProperty(window.wrappedJSObject, "loggingEnabled", { return false; }, window), - set: exportFunction(function (value = {}) {}, window), + set: exportFunction(function () {}, window), }); diff --git a/browser/extensions/webcompat/lib/custom_functions.js b/browser/extensions/webcompat/lib/custom_functions.js index 97603e0424..041a8c0041 100644 --- a/browser/extensions/webcompat/lib/custom_functions.js +++ b/browser/extensions/webcompat/lib/custom_functions.js @@ -27,7 +27,7 @@ const replaceStringInRequest = ( carryover = replaced.slice(-carryoverLength); }; - filter.onstop = event => { + filter.onstop = () => { if (carryover.length) { filter.write(encoder.encode(carryover)); } diff --git a/browser/extensions/webcompat/lib/shims.js b/browser/extensions/webcompat/lib/shims.js index fedb4c38e9..793d0eefb2 100644 --- a/browser/extensions/webcompat/lib/shims.js +++ b/browser/extensions/webcompat/lib/shims.js @@ -765,7 +765,7 @@ class Shims { }); } - async _onMessageFromShim(payload, sender, sendResponse) { + async _onMessageFromShim(payload, sender) { const { tab, frameId } = sender; const { id, url } = tab; const { shimId, message } = payload; diff --git a/browser/extensions/webcompat/lib/ua_overrides.js b/browser/extensions/webcompat/lib/ua_overrides.js index 2426293f3f..dd3bef2393 100644 --- a/browser/extensions/webcompat/lib/ua_overrides.js +++ b/browser/extensions/webcompat/lib/ua_overrides.js @@ -87,7 +87,7 @@ class UAOverrides { const listeners = { onBeforeSendHeaders: listener }; if (blocks) { - const blistener = details => { + const blistener = () => { return { cancel: true }; }; diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json index f15b3bb938..683ea6c1ae 100644 --- a/browser/extensions/webcompat/manifest.json +++ b/browser/extensions/webcompat/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Web Compatibility Interventions", "description": "Urgent post-release fixes for web compatibility.", - "version": "125.0.0", + "version": "125.1.0", "browser_specific_settings": { "gecko": { "id": "webcompat@mozilla.org", diff --git a/browser/extensions/webcompat/shims/eluminate.js b/browser/extensions/webcompat/shims/eluminate.js index 3fa65c048c..7d72ed8442 100644 --- a/browser/extensions/webcompat/shims/eluminate.js +++ b/browser/extensions/webcompat/shims/eluminate.js @@ -32,7 +32,7 @@ if (!window.CM_DDX) { invokeFunctionWhenAvailable: a => { a(); }, - gup: d => "", + gup: _d => "", privacy: { isDoNotTrackEnabled: () => false, setDoNotTrack: () => {}, diff --git a/browser/extensions/webcompat/shims/google-ima.js b/browser/extensions/webcompat/shims/google-ima.js index 1f5e56239d..c9caef2182 100644 --- a/browser/extensions/webcompat/shims/google-ima.js +++ b/browser/extensions/webcompat/shims/google-ima.js @@ -124,9 +124,9 @@ if (!window.google?.ima?.VERSION) { setPpid(p) { this.#p = p; } - setSessionId(s) {} - setVpaidAllowed(a) {} - setVpaidMode(m) {} + setSessionId(_s) {} + setVpaidAllowed(_a) {} + setVpaidMode(_m) {} } ImaSdkSettings.CompanionBackfillMode = { ALWAYS: "always", @@ -174,7 +174,7 @@ if (!window.google?.ima?.VERSION) { getVersion() { return VERSION; } - requestAds(r, c) { + requestAds(_r, _c) { // If autoplay is disabled and the page is trying to autoplay a tracking // ad, then IMA fails with an error, and the page is expected to request // ads again later when the user clicks to play. @@ -222,7 +222,7 @@ if (!window.google?.ima?.VERSION) { getVolume() { return this.#volume; } - init(w, h, m, e) {} + init(_w, _h, _m, _e) {} isCustomClickTrackingUsed() { return false; } @@ -231,7 +231,7 @@ if (!window.google?.ima?.VERSION) { } pause() {} requestNextAdBreak() {} - resize(w, h, m) {} + resize(_w, _h, _m) {} resume() {} setVolume(v) { this.#volume = v; @@ -259,7 +259,7 @@ if (!window.google?.ima?.VERSION) { }); } stop() {} - updateAdsRenderingSettings(s) {} + updateAdsRenderingSettings(_s) {} } class AdsRenderingSettings {} diff --git a/browser/extensions/webcompat/shims/rambler-authenticator.js b/browser/extensions/webcompat/shims/rambler-authenticator.js index 1fe074b660..77abd35ab1 100644 --- a/browser/extensions/webcompat/shims/rambler-authenticator.js +++ b/browser/extensions/webcompat/shims/rambler-authenticator.js @@ -46,7 +46,7 @@ if (!window.ramblerIdHelper) { })(); const ramblerIdHelper = { - getProfileInfo: (successCallback, errorCallback) => { + getProfileInfo: (successCallback, _errorCallback) => { successCallback({}); }, openAuth: () => { diff --git a/browser/extensions/webcompat/shims/webtrends.js b/browser/extensions/webcompat/shims/webtrends.js index c7ef0069da..34bcdb7285 100644 --- a/browser/extensions/webcompat/shims/webtrends.js +++ b/browser/extensions/webcompat/shims/webtrends.js @@ -26,7 +26,7 @@ if (!window.WebTrends) { return this; } DCSext = {}; - init(obj) { + init(_obj) { return this; } track() { -- cgit v1.2.3