diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-05-24 05:38:13 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-05-24 05:38:13 +0800 |
| commit | a439e04ed4fae2bbf4da6cfca2a516991aa89178 (patch) | |
| tree | 350ed72bc2cc609bc6fd2e638cda3ad03b7d3e61 /app | |
| parent | 33f9aabf3ec9de153c12d831a09950c061bb5018 (diff) | |
| parent | 9aea88da3255a470e1833de5d356a159cd9bea0e (diff) | |
| download | tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar.gz tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar.bz2 tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar.lz tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar.xz tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.tar.zst tangerine-wallet-browser-a439e04ed4fae2bbf4da6cfca2a516991aa89178.zip | |
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/contentscript.js | 8 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 1b7b98ec9..43ae5bc98 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -25,14 +25,14 @@ pluginStream.on('error', console.error.bind(console)) // forward communication plugin->inpage pageStream.pipe(pluginStream).pipe(pageStream) -// connect contentscript->inpage control stream +// connect contentscript->inpage reload stream var mx = ObjectMultiplex() mx.on('error', console.error.bind(console)) mx.pipe(pageStream) -var controlStream = mx.createStream('control') -controlStream.on('error', console.error.bind(console)) +var reloadStream = mx.createStream('reload') +reloadStream.on('error', console.error.bind(console)) // if we lose connection with the plugin, trigger tab refresh pluginStream.on('close', function(){ - controlStream.write({ method: 'reset' }) + reloadStream.write({ method: 'reset' }) })
\ No newline at end of file diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 652a95d7c..b8532747e 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -36,8 +36,8 @@ console.log('MetaMask - injected web3') // export global web3 with auto dapp reload // -var controlStream = inpageProvider.multiStream.createStream('control') -setupDappAutoReload(web3, controlStream) +var reloadStream = inpageProvider.multiStream.createStream('reload') +setupDappAutoReload(web3, reloadStream) // set web3 defaultAcount inpageProvider.publicConfigStore.subscribe(function(state){ |