fix: fix service worker ready error

yuanyxh · May 15, 2024 · 583aedb · 583aedb
1 parent a996e65
commit 583aedb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/viewer/Settings.tsx b/src/viewer/Settings.tsx
@@ -36,15 +36,18 @@ function ServiceWorkerCache() {
   const handleSwitchServiceWorkerCache = async (
     enableServiceWorkerCache: boolean
   ) => {
-    setSpinning(true);
+    /*
+      TIPS: When we turn off the Service Worker, Ready will never be resolved because the page is not related to the service worker
+    */
+    // const registration = await window.navigator.serviceWorker.ready;
 
-    const registration = await window.navigator.serviceWorker.ready;
+    // if (registration.waiting || registration.installing) {
+    //   return error(
+    //     'service worker 正在安装中，此过程不可被打断，请稍后执行此操作。'
+    //   );
+    // }
 
-    if (registration.waiting || registration.installing) {
-      return error(
-        'service worker 正在安装中，此过程不可被打断，请稍后执行此操作。'
-      );
-    }
+    setSpinning(true);
 
     if (enableServiceWorkerCache) {
       return serviceWorkerRef.current

diff --git a/src/viewer/styles/Index.module.less b/src/viewer/styles/Index.module.less
@@ -34,6 +34,7 @@
       img {
         width: 100%;
         height: 100%;
+        user-select: none;
       }
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ @@
           img {
             width: 100%;
             height: 100%;
+            user-select: none;
           }
         }
       }
@@ Expand Down @@