From 0f8722bf58caa0ce9d0a56daaee2efde62c83028 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 16 Jan 2020 17:26:00 -0500 Subject: [PATCH 1/2] fix iframe injection --- app/components/Views/BrowserTab/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js index 324ee988d48..beec8fb1419 100644 --- a/app/components/Views/BrowserTab/index.js +++ b/app/components/Views/BrowserTab/index.js @@ -1235,7 +1235,11 @@ export class BrowserTab extends PureComponent { if (data.name) { this.backgroundBridges.forEach(bridge => { const { origin } = data && data.origin && new URL(data.origin); - bridge.url === origin && bridge.onMessage(data); + if (bridge.isMainFrame) { + bridge.url === origin && bridge.onMessage(data); + } else { + bridge.url === data.origin && bridge.onMessage(data); + } }); return; } From fd944390f84241ef3e0d0736ec2d1c48c44ead56 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 16 Jan 2020 17:27:06 -0500 Subject: [PATCH 2/2] refactor --- app/components/Views/BrowserTab/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js index beec8fb1419..16be5d04a65 100644 --- a/app/components/Views/BrowserTab/index.js +++ b/app/components/Views/BrowserTab/index.js @@ -1234,8 +1234,8 @@ export class BrowserTab extends PureComponent { } if (data.name) { this.backgroundBridges.forEach(bridge => { - const { origin } = data && data.origin && new URL(data.origin); if (bridge.isMainFrame) { + const { origin } = data && data.origin && new URL(data.origin); bridge.url === origin && bridge.onMessage(data); } else { bridge.url === data.origin && bridge.onMessage(data);