From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/extensions/webcompat/data/injections.js | 95 ++++++----------- browser/extensions/webcompat/data/shims.js | 11 -- browser/extensions/webcompat/data/ua_overrides.js | 124 ++++------------------ 3 files changed, 50 insertions(+), 180 deletions(-) (limited to 'browser/extensions/webcompat/data') diff --git a/browser/extensions/webcompat/data/injections.js b/browser/extensions/webcompat/data/injections.js index c541622914..87b1da747b 100644 --- a/browser/extensions/webcompat/data/injections.js +++ b/browser/extensions/webcompat/data/injections.js @@ -185,20 +185,6 @@ const AVAILABLE_INJECTIONS = [ ], }, }, - { - id: "bug1654877", - platform: "android", - domain: "preev.com", - bug: "1654877", - contentScripts: { - matches: ["*://preev.com/*"], - css: [ - { - file: "injections/css/bug1654877-preev.com-moz-appearance-fix.css", - }, - ], - }, - }, { id: "bug1654907", platform: "android", @@ -213,24 +199,6 @@ const AVAILABLE_INJECTIONS = [ ], }, }, - { - id: "bug1631811", - platform: "all", - domain: "datastudio.google.com", - bug: "1631811", - contentScripts: { - matches: [ - "https://datastudio.google.com/embed/reporting/*", - "https://lookerstudio.google.com/embed/reporting/*", - ], - js: [ - { - file: "injections/js/bug1631811-datastudio.google.com-indexedDB.js", - }, - ], - allFrames: true, - }, - }, { id: "bug1694470", platform: "android", @@ -425,23 +393,6 @@ const AVAILABLE_INJECTIONS = [ allFrames: true, }, }, - { - id: "bug1790750", - platform: "all", - domain: "relearnings.com", - bug: "1790750", - contentScripts: { - matches: [ - "https://relearnings.com/linkedinlearning.html", // Bug 1790750 - ], - js: [ - { - file: "injections/js/bug1790750-relearnings.com-linkedinlearning-iframe-fix.js", - }, - ], - allFrames: true, - }, - }, { id: "bug1859617", platform: "all", @@ -557,11 +508,12 @@ const AVAILABLE_INJECTIONS = [ "*://*.avanabayview.com/*", // #118617 "*://*.breakpointeandcoronado.com/*", // #117735 "*://*.courtsatspringmill.com/*", // #128404 + "*://*.fieldstoneamherst.com/*", // #132974 "*://*.gslbriarcreek.com/*", // #126401 + "*://*.hpixeniatrails.com/*", // #131703 "*://*.liveatlasathens.com/*", // #111189 "*://*.liveobserverpark.com/*", // #105244 "*://*.liveupark.com/*", // #121083 - "*://*.metropolisapt.com/*", // #129105 "*://*.midwayurban.com/*", // #116523 "*://*.nhcalaska.com/*", "*://*.prospectportal.com/*", // #115206 @@ -569,7 +521,6 @@ const AVAILABLE_INJECTIONS = [ "*://*.thefoundryat41st.com/*", // #128994 "*://*.theloftsorlando.com/*", "*://*.vanallenapartments.com/*", // #120056 - "*://*.waterfordapartmentstulsa.com/*", // #125870 ], css: [ { @@ -957,20 +908,6 @@ const AVAILABLE_INJECTIONS = [ ], }, }, - { - id: "bug1848716", - platform: "desktop", - domain: "elal.com", - bug: "1848716", - contentScripts: { - matches: ["*://*.elal.com/*"], - css: [ - { - file: "injections/css/bug1848716-elal.com-unsupported-banner.css", - }, - ], - }, - }, { id: "bug1848849", platform: "all", @@ -1091,6 +1028,34 @@ const AVAILABLE_INJECTIONS = [ ], }, }, + { + id: "bug1877346", + platform: "android", + domain: "offerup.com", + bug: "1877346", + contentScripts: { + matches: ["*://offerup.com/*"], + css: [ + { + file: "injections/css/bug1877346-offerup.com-infinite-scroll-fix.css", + }, + ], + }, + }, + { + id: "bug1884842", + platform: "android", + domain: "foodora.cz", + bug: "1884842", + contentScripts: { + matches: ["*://*.foodora.cz/*"], + css: [ + { + file: "injections/css/bug1884842-foodora.cz-height-fix.css", + }, + ], + }, + }, ]; module.exports = AVAILABLE_INJECTIONS; diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js index 16919dbec7..f26ad96d04 100644 --- a/browser/extensions/webcompat/data/shims.js +++ b/browser/extensions/webcompat/data/shims.js @@ -320,17 +320,6 @@ const AVAILABLE_SHIMS = [ ], onlyIfBlockedByETP: true, }, - { - id: "PBMWebAPIFixes", - platform: "all", - name: "Private Browsing Web APIs", - bug: "1773110", - runFirst: "private-browsing-web-api-fixes.js", - matches: [ - "*://*.imgur.io/js/vendor.*.js", // Mobile: imgur.io (bug 1742344); desktop: imgur.com (unaffected) - ], - onlyIfPrivateBrowsing: true, - }, { id: "Eluminate", platform: "all", diff --git a/browser/extensions/webcompat/data/ua_overrides.js b/browser/extensions/webcompat/data/ua_overrides.js index cabaed5bf9..3645e962f0 100644 --- a/browser/extensions/webcompat/data/ua_overrides.js +++ b/browser/extensions/webcompat/data/ua_overrides.js @@ -288,25 +288,6 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, - { - /* - * Bug 1595215 - UA overrides for Uniqlo sites - * Webcompat issue #38825 - https://webcompat.com/issues/38825 - * - * To receive the proper mobile version instead of the desktop version or - * avoid redirect loop, the UA is spoofed. - */ - id: "bug1595215", - platform: "android", - domain: "uniqlo.com", - bug: "1595215", - config: { - matches: ["*://*.uniqlo.com/*"], - uaTransformer: originalUA => { - return originalUA + " Mobile Safari"; - }, - }, - }, { /* * Bug 1622063 - UA override for wp1-ext.usps.gov @@ -683,42 +664,6 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, - { - /* - * Bug 1790698 - UA override for wolf777.com - * Webcompat issue #103981 - https://webcompat.com/issues/103981 - * - * Add 'Linux; ' next to the Android version or the site breaks - */ - id: "bug1790698", - platform: "android", - domain: "wolf777.com", - bug: "1790698", - config: { - matches: ["*://wolf777.com/*"], - uaTransformer: originalUA => { - return originalUA.replace("Android", "Linux; Android"); - }, - }, - }, - { - /* - * Bug 1800936 - UA override for cov19ent.kdca.go.kr - * Webcompat issue #110655 - https://webcompat.com/issues/110655 - * - * Add 'Chrome;' to the UA for the site to load styles - */ - id: "bug1800936", - platform: "all", - domain: "cov19ent.kdca.go.kr", - bug: "1800936", - config: { - matches: ["*://cov19ent.kdca.go.kr/*"], - uaTransformer: originalUA => { - return originalUA + " Chrome"; - }, - }, - }, { /* * Bug 1819702 - UA override for feelgoodcontacts.com @@ -914,22 +859,6 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, - { - /* - * Bug 1827678 - UA override for f2bbs.com - * Webcompat issue #84932 - https://webcompat.com/issues/84932 - */ - id: "bug1827678-webc84932", - platform: "android", - domain: "f2bbs.com", - bug: "1827678", - config: { - matches: ["*://f2bbs.com/*"], - uaTransformer: originalUA => { - return UAHelpers.getDeviceAppropriateChromeUA(); - }, - }, - }, { /* * Bug 1827678 - UA override for kt.com @@ -962,22 +891,6 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, - { - /* - * Bug 1827678 - UA override for sistema.ibglbrasil.com.br - * Webcompat issue #119785 - https://webcompat.com/issues/119785 - */ - id: "bug1827678-webc119785", - platform: "all", - domain: "sistema.ibglbrasil.com.br", - bug: "1827678", - config: { - matches: ["*://sistema.ibglbrasil.com.br/*"], - uaTransformer: originalUA => { - return UAHelpers.getDeviceAppropriateChromeUA(); - }, - }, - }, { /* * Bug 1827678 - UA override for onp.cloud.waterloo.ca @@ -1051,23 +964,6 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, - { - /* - * Bug 1751604 - UA override for /www.otsuka.co.jp/fib/ - * - * The site's content is not loaded on mobile unless a Chrome UA is used. - */ - id: "bug1829126", - platform: "android", - domain: "www.otsuka.co.jp", - bug: "1829126", - config: { - matches: ["*://www.otsuka.co.jp/fib/*"], - uaTransformer: originalUA => { - return UAHelpers.getDeviceAppropriateChromeUA(); - }, - }, - }, { /* * Bug 1836109 - UA override for watch.tonton.com.my @@ -1298,6 +1194,8 @@ const AVAILABLE_UA_OVERRIDES = [ "*://thematiques.metro.fr/*", "*://volantino.metro.it/*", "*://view.publitas.com/*", + "*://magazine.kruidvat.be/*", + "*://folder.kruidvat.nl/*", ], uaTransformer: originalUA => { return UAHelpers.getDeviceAppropriateChromeUA(); @@ -1377,6 +1275,24 @@ const AVAILABLE_UA_OVERRIDES = [ }, }, }, + { + /* + * Bug 1884779 - UA override for + * Webcompat issue #134287 - https://webcompat.com/issues/134287 + * + * The site returns desktop layout on Firefox for Android + */ + id: "bug1884779", + platform: "android", + domain: "memurlar.net", + bug: "1884779", + config: { + matches: ["*://*.memurlar.net/*"], + uaTransformer: originalUA => { + return UAHelpers.getDeviceAppropriateChromeUA(); + }, + }, + }, ]; module.exports = AVAILABLE_UA_OVERRIDES; -- cgit v1.2.3