Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/extension-support/extension-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ class ExtensionManager {

this.loadingAsyncExtensions++;

const sandboxMode = await this.securityManager.getSandboxMode(normalURL);
const rewritten = await this.securityManager.rewriteExtensionURL(normalURL);
const sandboxMode = await this.securityManager.getSandboxMode(extensionURL);
const rewritten = await this.securityManager.rewriteExtensionURL(extensionURL);
const blob = (await fetch(rewritten).then(req => req.blob()))
const blobUrl = URL.createObjectURL(blob)
const newHash = await new Promise(resolve => {
Expand All @@ -316,7 +316,7 @@ class ExtensionManager {
.catch(error => this._failedLoadingExtensionScript(error));
const fakeWorkerId = this.nextExtensionWorker++;
const returnedIDs = [];
this.workerURLs[fakeWorkerId] = normalURL;
this.workerURLs[fakeWorkerId] = extensionURL;

for (const extensionObject of extensionObjects) {
const extensionInfo = extensionObject.getInfo();
Expand Down Expand Up @@ -344,7 +344,7 @@ class ExtensionManager {
/* eslint-enable max-len */

return new Promise((resolve, reject) => {
this.pendingExtensions.push({ extensionURL: rewritten, resolve, reject });
this.pendingExtensions.push({ extensionURL, rewrittenURL: rewritten, resolve, reject });
dispatch.addWorker(new ExtensionWorker());
}).catch(error => this._failedLoadingExtensionScript(error));
}
Expand Down Expand Up @@ -851,4 +851,4 @@ class ExtensionManager {
}
}

module.exports = ExtensionManager;
module.exports = ExtensionManager;
Loading