Skip to content

Commit b73bac1

Browse files
committed
Fix automatic reloading broken if the background script / service worker is not already initialized on UI load.
1 parent 4fb2625 commit b73bac1

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

src/bg/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
// no embedder to answer us
122122
}
123123
log("STARTED");
124-
await include("/bg/popupHandler.js");
125124
};
126125

127126
const Commands = {

src/bg/popupHandler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020

2121
browser.runtime.onConnect.addListener(port => {
2222
if (port.name === "noscript.popup") {
23+
console.debug("Creating popupHandler port"); // DEV_ONLY
2324
ns.popupOpened = true;
2425
let pendingReload = false;
2526
let tabId = -1;
2627
port.onMessage.addListener(m => {
28+
console.debug("popupHandler message", m); // DEV_ONLY
2729
if ("pendingReload" in m) {
2830
tabId = m.tabId;
2931
pendingReload = m.pendingReload;

src/manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"bg/TabGuard.js",
8383
"bg/RequestGuard.js",
8484
"bg/Settings.js",
85+
"bg/popupHandler.js",
8586
"bg/main.js",
8687
"common/themes.js"
8788
],

src/ui/popup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ addEventListener("unload", e => {
9898
})
9999

100100
port = browser.runtime.connect({name: "noscript.popup"});
101+
console.debug("popupHandler port connecting"); // DEV_ONLY
101102
await UI.init(pageTab);
102103

103104
function pendingReload(b) {

0 commit comments

Comments
 (0)