diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-09-15 02:57:41 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-09-15 02:57:41 +0800 |
| commit | b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1 (patch) | |
| tree | 65c34d13dc4dc9c6bf7e409e177f399ac4313f29 /app/scripts | |
| parent | cf265238521619df6e8c8b64327c42507e873cf7 (diff) | |
| download | tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar.gz tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar.bz2 tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar.lz tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar.xz tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.tar.zst tangerine-wallet-browser-b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1.zip | |
Fix popup flag assignment
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/background.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 18a112dd1..b2268425a 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -44,7 +44,7 @@ function connectRemote (remotePort) { var portStream = new PortStream(remotePort) if (isMetaMaskInternalProcess) { // communication with popup - remotePort.name === 'popup' ? popupIsOpen = true : popupIsOpen = false + popupIsOpen = remotePort.name === 'popup' setupTrustedCommunication(portStream, 'MetaMask', remotePort.name) } else { // communication with page @@ -67,7 +67,6 @@ function setupTrustedCommunication (connectionStream, originDomain, metamaskCont // connect features setupControllerConnection(mx.createStream('controller')) controller.setupProviderConnection(mx.createStream('provider'), originDomain) - if (metamaskContext === 'popup') popupIsOpen = true } // |