diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-10-20 06:25:27 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-10-20 06:25:27 +0800 |
| commit | 2f7ce1ca4cd7c5a953e584434049cf409437c8e3 (patch) | |
| tree | 08c230826b33af8558a3065794de960e1bdc8cdb /app | |
| parent | 4366f72fe1d9f0c3a94f27e5f23bd826f8cf69e0 (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.gz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.bz2 tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.lz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.xz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.zst tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.zip | |
Merge branch 'master' into i#741
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json index cbce01468..8f5a34ea6 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.13.4", + "version": "2.13.5", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ef199946c..85dd70b4d 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload) var pingChannel = inpageProvider.multiStream.createStream('pingpong') var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse -metamaskStream.once('data', function(){ +metamaskStream.once('_data', function(){ pingStream.pipe(pingChannel).pipe(pingStream) }) endOfStream(pingStream, triggerReload) |