Merge 7d99559a30 into f14257d813

[mv3] Minor visual fix in dashboard's Welcome section
[mv3] Fix using Optimal as default mode when hosts permission allows it
2026-03-11 09:04:36 +00:00 · 2024-12-10 22:07:21 +01:00 · 2024-12-10 10:22:38 -05:00 · 2024-12-10 10:16:35 -05:00 · 2023-11-28 13:53:14 +00:00
4 changed files with 25 additions and 8 deletions
--- a/platform/mv3/extension/css/settings.css
+++ b/platform/mv3/extension/css/settings.css
@ -9,6 +9,12 @@ body.firstRun .firstRun {
    display: block;
    padding: 8px;
    }
+body .firstRun > *:first-child {
+    margin-top: 0;
+    }
+body .firstRun > *:last-child {
+    margin-bottom: 0;
+    }
 h3 {
    margin: 1em 0;
    }
--- a/platform/mv3/extension/js/background.js
+++ b/platform/mv3/extension/js/background.js
@ -93,7 +93,11 @@ async function hasGreatPowers(origin) {
    });
 }

-function hasOmnipotence() {
+async function hasOmnipotence() {
+    const manifest = runtime.getManifest();
+    const hasOmnipotence = Array.isArray(manifest.host_permissions) &&
+        manifest.host_permissions.includes('<all_urls>');
+    if ( hasOmnipotence ) { return true; }
    return browser.permissions.contains({
        origins: [ '<all_urls>' ],
    });
@ -436,13 +440,15 @@ async function start() {
            if ( afterLevel === MODE_OPTIMAL ) {
                updateDynamicRules();
                registerInjectables();
+                process.firstRun = false;
            }
-        }
-        const disableFirstRunPage = await adminRead('disableFirstRunPage');
-        if ( disableFirstRunPage !== true ) {
-            runtime.openOptionsPage();
        } else {
-            process.firstRun = false;
+            const disableFirstRunPage = await adminRead('disableFirstRunPage');
+            if ( disableFirstRunPage !== true ) {
+                runtime.openOptionsPage();
+            } else {
+                process.firstRun = false;
+            }
        }
    }

--- a/platform/mv3/extension/js/mode-manager.js
+++ b/platform/mv3/extension/js/mode-manager.js
@ -252,10 +252,11 @@ async function writeFilteringModeDetails(afterDetails) {
    localWrite('filteringModeDetails', data);
    sessionWrite('filteringModeDetails', data);
    readFilteringModeDetails.cache = unserializeModeDetails(data);
-
-    Promise.all([
+    return Promise.all([
        getDefaultFilteringMode(),
        getTrustedSites(),
+        localWrite('filteringModeDetails', data),
+        sessionWrite('filteringModeDetails', data),
    ]).then(results => {
        broadcastMessage({
            defaultFilteringMode: results[0],
--- a/src/web_accessible_resources/google-ima.js
+++ b/src/web_accessible_resources/google-ima.js
@ -15,6 +15,7 @@
 * - Corrected typo in `UniversalAdIdInfo.getAdIdValue()` method name
 * - Corrected dispatch of LOAD event when preloading is enabled
 * - Corrected dispatch of CONTENT_PAUSE/RESUME_REQUESTED events
+ * - Added missing `AdsRequest.omidAccessModeRules` property
 * 
 * Related issue:
 * - https://github.com/uBlockOrigin/uBlock-issues/issues/2158
@ -488,6 +489,9 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
  class AdsRenderingSettings {}

  class AdsRequest {
+    constructor() {
+      this.omidAccessModeRules = {};
+    }
    setAdWillAutoPlay() {}
    setAdWillPlayMuted() {}
    setContinuousPlayback() {}
Author	SHA1	Message	Date
Dave Vandyke	fd8e6d4943	Merge `7d99559a30` into `f14257d813`	2024-12-10 22:07:21 +01:00
Raymond Hill	f14257d813	[mv3] Minor visual fix in dashboard's Welcome section	2024-12-10 10:22:38 -05:00
Raymond Hill	0e1800e68d	[mv3] Fix using Optimal as default mode when hosts permission allows it Related issue: https://github.com/uBlockOrigin/uBOL-home/discussions/161	2024-12-10 10:16:35 -05:00
Dave Vandyke	7d99559a30	Add AdRequest.omidAccessModeRules property to google-ima shim Add the missing AdRequest.omidAccessModeRules[1] property, to avoid breaking websites that access it. 1 - https://developers.google.com/interactive-media-ads/docs/sdks/html5/client-side/reference/js/google.ima.AdsRequest#omidAccessModeRules	2023-11-28 13:53:14 +00:00