Merge branch 'master' of https://github.com/kabir-afk/SignIt

kabir-afk · Jun 19, 2024 · 63ea338 · 63ea338
2 parents 839b281 + 7512d92
commit 63ea338
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/popup/popup.js b/popup/popup.js
@@ -382,10 +382,21 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome')
 		ui = new UI();
 		ui.switchPanel( 'loaded' );
 	}
-	chrome.runtime.onMessage.addListener((message, sender) => {
-		console.log(sender);
-		if (message.state === "ready") {
-			ui = new UI();
-		}
+	if (browserType === "chrome") {
+    chrome.runtime.onMessage.addListener((message, sender) => {
+      if (message.state === "ready") {
+        ui = new UI();
+      }
     });
+  } else {
+    let state = _backgroundPage.state;
+    function waitWhileLoading() {
+      if (state === "ready") {
+        ui = new UI();
+      } else {
+        setTimeout(waitWhileLoading, 100);
+      }
+    }
+    waitWhileLoading();
+  }
 })();
diff --git a/sw.js b/sw.js
@@ -773,7 +773,7 @@ const WAIT_ALARM = 'waitWhileLoading';
 async function createAlarm() {
   await chrome.alarms.create(WAIT_ALARM, {
     periodInMinutes: 1 / 60 // by specifying it as fraction we can run the ⏰ in every 1 second
-  },()=>console.log('⏰ running inside createAlarm()',new Date().getSeconds()));
+  });
 }
 
 chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
@@ -788,9 +788,7 @@ chrome.alarms.onAlarm.addListener((alarm)=>{
   if (alarm.name === WAIT_ALARM) {
     if (state === 'ready') {
       chrome.runtime.sendMessage({state:'ready'});
-        chrome.alarms.clear(WAIT_ALARM,()=>{
-        console.log('⏰ stopped at ',new Date().getSeconds());
-      });
+        chrome.alarms.clear(WAIT_ALARM);
     }
   }
 })