diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-19 05:20:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 05:20:16 +0800 |
| commit | 82489129d5c8eda70f21e7037d428969e695b87b (patch) | |
| tree | 2d21b266d930280311a215a62f6e40fa61cce773 /app | |
| parent | 049705004f306bb83ad1bc0b7315d322becf8263 (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.gz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.bz2 tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.lz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.xz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.zst tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.zip | |
Merge branch 'master' into i743-FixDelegateCallFlag
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) |