diff options
author | kumavis <aaron@kumavis.me> | 2018-05-30 07:12:36 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-05-30 07:12:36 +0800 |
commit | 4205d9272991c6523fbb8b9222f86411d0253325 (patch) | |
tree | 2dce14c72c4a0a62d57f8889072233e2a1f1f410 /app/scripts/background.js | |
parent | 219cb83d94566a597f7ffa2ba34454460d2deb5d (diff) | |
parent | 5fc24930a7febd919ec6a8f6e9c14f2bac0ef2b2 (diff) | |
download | tangerine-wallet-browser-4205d9272991c6523fbb8b9222f86411d0253325.tar.gz tangerine-wallet-browser-4205d9272991c6523fbb8b9222f86411d0253325.tar.zst tangerine-wallet-browser-4205d9272991c6523fbb8b9222f86411d0253325.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r-- | app/scripts/background.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 686296329..56e190f97 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -309,6 +309,7 @@ function setupController (initState, initLangCode) { // connect to other contexts // extension.runtime.onConnect.addListener(connectRemote) + extension.runtime.onConnectExternal.addListener(connectExternal) const metamaskInternalProcessHash = { [ENVIRONMENT_TYPE_POPUP]: true, @@ -335,9 +336,9 @@ function setupController (initState, initLangCode) { function connectRemote (remotePort) { const processName = remotePort.name const isMetaMaskInternalProcess = metamaskInternalProcessHash[processName] - const portStream = new PortStream(remotePort) if (isMetaMaskInternalProcess) { + const portStream = new PortStream(remotePort) // communication with popup controller.isClientOpen = true controller.setupTrustedCommunication(portStream, 'MetaMask') @@ -370,12 +371,17 @@ function setupController (initState, initLangCode) { }) } } else { - // communication with page - const originDomain = urlUtil.parse(remotePort.sender.url).hostname - controller.setupUntrustedCommunication(portStream, originDomain) + connectExternal(remotePort) } } + // communication with page or other extension + function connectExternal(remotePort) { + const originDomain = urlUtil.parse(remotePort.sender.url).hostname + const portStream = new PortStream(remotePort) + controller.setupUntrustedCommunication(portStream, originDomain) + } + // // User Interface setup // |