Merge branch 'main' into navbar_clipping

android-components/components/feature/webcompat/src/main/assets/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",
@@ -540,19 +508,19 @@ 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
         "*://*.securityproperties.com/*",
         "*://*.thefoundryat41st.com/*", // #128994
         "*://*.theloftsorlando.com/*",
         "*://*.vanallenapartments.com/*", // #120056
-        "*://*.waterfordapartmentstulsa.com/*", // #125870
       ],
       css: [
         {
@@ -940,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",
@@ -1074,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;

android-components/components/feature/webcompat/src/main/assets/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",

android-components/components/feature/webcompat/src/main/assets/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;

android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/injections/css/bug1877346-offerup.com-infinite-scroll-fix.css

@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * offerup.com - Infinite scroll doesn't work
+ * Bug #1720060 - https://bugzilla.mozilla.org/show_bug.cgi?id=1720060
+ *
+ * The site uses IntersectionObserver to show new items on the page,
+ * as the page being scrolled and it doesn't work with with
+ * Dynamic Toolbar enabled. Adding an empty element after the content
+ * to make up for the height of the dynamic toolbar makes it work.
+ */
+
+#__next::after {
+  display: block;
+  width: 100%;
+  height: 10px;
+  content: "";
+}

android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/injections/css/bug1884842-foodora.cz-height-fix.css

@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * foodora.cz - Unable to pick an address
+ * Bug #1884842 - https://bugzilla.mozilla.org/show_bug.cgi?id=1884842
+ * WebCompat issue #130975 - https://github.com/webcompat/web-bugs/issues/130975
+ *
+ * Unable to confirm an adress on the delivery site due to button being outside
+ * the viewport and parent container unscrollable.
+ * Depends on https://bugzilla.mozilla.org/show_bug.cgi?id=1481876
+ */
+
+@media (max-width: 527.98px) {
+  .bds-c-modal--is-mobile-bottom-sheet .bds-c-modal__content-window {
+    height: 100%;
+  }
+}
+
+@media (min-height: 528px) {
+  .map-modal__map.map-box {
+    height: 362px;
+  }
+}