Prevent dashboard from loading at browser launch until ready

Related discussion: - uBlockOrigin/uAssets#16939 Various feedback of people trying to interact with uBO's dashboard at browser launch, before uBO's main process is fully initialized, causing confusion, and potential loss of data.
gorhill · Mar 16, 2023 · 5c92d95 · 5c92d95
1 parent 0cfc4ee
commit 5c92d95
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/src/css/dashboard.css b/src/css/dashboard.css
@@ -7,6 +7,9 @@ html, body {
     position: relative;
     width: 100vw;
     }
+body.notReady {
+    display: none;
+    }
 #dashboard-nav {
     border: 0;
     border-bottom: 1px solid var(--border-1);

diff --git a/src/dashboard.html b/src/dashboard.html
@@ -10,7 +10,8 @@
 <link rel="shortcut icon" type="image/png" href="img/icon_64.png">
 </head>
 
-<body>
+<body class="notReady">
+
 <div id="dashboard-nav">
     <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg"></span><!--
  --><button class="tabButton" type="button" data-pane="settings.html" data-i18n="settingsPageName" tabindex="0"></button><!--

diff --git a/src/js/dashboard.js b/src/js/dashboard.js
@@ -102,6 +102,27 @@ if ( self.location.hash.slice(1) === 'no-dashboard.html' ) {
 }
 
 (async ( ) => {
+    // Wait for uBO's main process to be ready
+    await new Promise(resolve => {
+        const check = ( ) => {
+            vAPI.messaging.send('dashboard', {
+                what: 'readyToFilter'
+            }).then(response => {
+                if ( response ) { return resolve(true); }
+                const iframe = qs$('#iframe');
+                if ( iframe.src !== '' ) {
+                    iframe.src = '';
+                }
+                vAPI.setTimeout(check, 250);
+            }).catch(( ) => {
+                vAPI.setTimeout(check, 250);
+            });
+        };
+        check();
+    });
+
+    dom.cl.remove(dom.body, 'notReady');
+
     const results = await Promise.all([
         // https://github.com/uBlockOrigin/uBlock-issues/issues/106
         vAPI.messaging.send('dashboard', { what: 'dashboardConfig' }),

diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -312,6 +312,10 @@ const onMessage = function(request, sender, callback) {
         µb.openNewTab(request.details);
         break;
 
+    case 'readyToFilter':
+        response = µb.readyToFilter;
+        break;
+
     // https://github.com/uBlockOrigin/uBlock-issues/issues/1954
     //   In case of document-blocked page, navigate to blocked URL instead
     //   of forcing a reload.