alex/yomichan
1
Fork 0
Code Releases Activity

Fix cross frame communication not exposing sourceTabId properly (#1379)

Browse Source
This commit is contained in:
toasted-nutbread 2021-02-13 12:13:05 -05:00 committed by GitHub
parent edc22b98e3
commit 00066e4eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/bg/js/backend.js
View File

@ -320,8 +320,8 @@ class Backend {
} }
if (details.name !== 'background-cross-frame-communication-port') { return; } if (details.name !== 'background-cross-frame-communication-port') { return; }
const tabId = (port.sender && port.sender.tab ? port.sender.tab.id : null); const senderTabId = (port.sender && port.sender.tab ? port.sender.tab.id : null);
if (typeof tabId !== 'number') { if (typeof senderTabId !== 'number') {
throw new Error('Port does not have an associated tab ID'); throw new Error('Port does not have an associated tab ID');
} }
const senderFrameId = port.sender.frameId; const senderFrameId = port.sender.frameId;
@ -330,11 +330,12 @@ class Backend {
} }
let {targetTabId, targetFrameId} = details; let {targetTabId, targetFrameId} = details;
if (typeof targetTabId !== 'number') { if (typeof targetTabId !== 'number') {
targetTabId = tabId; targetTabId = senderTabId;
} }
const details2 = { const details2 = {
name: 'cross-frame-communication-port', name: 'cross-frame-communication-port',
sourceTabId: senderTabId,
sourceFrameId: senderFrameId sourceFrameId: senderFrameId
}; };
let forwardPort = chrome.tabs.connect(targetTabId, {frameId: targetFrameId, name: JSON.stringify(details2)}); let forwardPort = chrome.tabs.connect(targetTabId, {frameId: targetFrameId, name: JSON.stringify(details2)});