diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:35:43 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:37:27 +0800 |
commit | 77d2deb17654b87dfd306b7f7cef335b1b511a8f (patch) | |
tree | 7476af4926a4e27999086ee570e46c4f74621b84 /app/scripts/inpage.js | |
parent | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff) | |
parent | 6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0 (diff) | |
download | tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.gz tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.zst tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.zip |
Merged master into dev
Diffstat (limited to 'app/scripts/inpage.js')
-rw-r--r-- | app/scripts/inpage.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 68c6165c8..42332d92e 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -2,8 +2,8 @@ cleanContextForImports() require('web3/dist/web3.min.js') const LocalMessageDuplexStream = require('post-message-stream') -const PingStream = require('ping-pong-stream/ping') -const endOfStream = require('end-of-stream') +// const PingStream = require('ping-pong-stream/ping') +// const endOfStream = require('end-of-stream') const setupDappAutoReload = require('./lib/auto-reload.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js') restoreContextAfterImports() @@ -40,13 +40,15 @@ reloadStream.once('data', triggerReload) // setup ping timeout autoreload // LocalMessageDuplexStream does not self-close, so reload if pingStream fails -var pingChannel = inpageProvider.multiStream.createStream('pingpong') -var pingStream = new PingStream({ objectMode: true }) +// var pingChannel = inpageProvider.multiStream.createStream('pingpong') +// var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse -metamaskStream.once('_data', function () { - pingStream.pipe(pingChannel).pipe(pingStream) -}) -endOfStream(pingStream, triggerReload) + +// disable pingStream until https://github.com/MetaMask/metamask-plugin/issues/746 is resolved more gracefully +// metamaskStream.once('data', function(){ +// pingStream.pipe(pingChannel).pipe(pingStream) +// }) +// endOfStream(pingStream, triggerReload) // set web3 defaultAcount inpageProvider.publicConfigStore.subscribe(function (state) { |