diff options
author | hackademix | 2018-08-22 16:34:16 +0200 |
---|---|---|
committer | hackademix | 2018-08-22 16:34:16 +0200 |
commit | 075a5ad0e0f9b4f9af614194d9c8d21d0ed45184 (patch) | |
tree | cc341040d0515e54ec8466dec8d3e32c381f1457 /src/bg/RequestGuard.js | |
parent | 48c04726b8d2da0023abd0ccef3e2d09511bea47 (diff) | |
download | noscript-075a5ad0e0f9b4f9af614194d9c8d21d0ed45184.tar.gz noscript-075a5ad0e0f9b4f9af614194d9c8d21d0ed45184.tar.xz noscript-075a5ad0e0f9b4f9af614194d9c8d21d0ed45184.zip |
More coherent wrapper around the webex messaging API.
Diffstat (limited to 'src/bg/RequestGuard.js')
-rw-r--r-- | src/bg/RequestGuard.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js index ccf3c70..e6be19e 100644 --- a/src/bg/RequestGuard.js +++ b/src/bg/RequestGuard.js @@ -263,7 +263,7 @@ var RequestGuard = (() => { return true; }, - async docStatus(message, sender) { + async queryDocStatus(message, sender) { let {frameId, tab} = sender; let {url} = message; let tabId = tab.id; @@ -291,10 +291,9 @@ var RequestGuard = (() => { if (pending) request.initialUrl = pending.initialUrl; if (type !== "sub_frame") { // we couldn't deliver it to frameId, since it's generally not loaded yet try { - await browser.tabs.sendMessage( - tabId, - {type: "seen", request, allowed, policyType, ownFrame: true}, - {frameId} + await Messages.send("seen", + {request, allowed, policyType, ownFrame: true}, + {tabId, frameId} ); } catch (e) { debug(`Couldn't deliver "seen" message for ${type}@${url} ${allowed ? "A" : "F" } to document ${documentUrl} (${frameId}/${tabId})`, e); @@ -302,10 +301,9 @@ var RequestGuard = (() => { } if (frameId === 0) return; try { - await browser.tabs.sendMessage( - tabId, - {type: "seen", request, allowed, policyType}, - {frameId: 0} + await Message.send("seen", + {request, allowed, policyType}, + {tabId, frameId: 0} ); } catch (e) { debug(`Couldn't deliver "seen" message to top frame containing ${documentUrl} (${frameId}/${tabId}`, e); |