diff options
author | Dan Finlay <somniac@me.com> | 2016-12-20 05:30:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-20 05:30:54 +0800 |
commit | 6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0 (patch) | |
tree | a7a3d89377abf5d8914e3993f6078173538a2387 | |
parent | abf1f6ec7920ad9cec40d3f8d63f9e4473e61c4c (diff) | |
parent | e1d6a1ea9440871b721ab921ce7e1a69b108f82e (diff) | |
download | tangerine-wallet-browser-6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0.tar.gz tangerine-wallet-browser-6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0.tar.zst tangerine-wallet-browser-6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0.zip |
Merge pull request #935 from MetaMask/kumavis-patch-1
inpage - temporarily disable ping stream
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | app/scripts/inpage.js | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac5acf917..0fd1e83bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Temporarily disable extension reload detection causing infinite reload bug. + ## 2.14.0 2016-12-16 - Removed Morden testnet provider from provider menu. diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ef199946c..7d43bd20e 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,14 @@ 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) { |