diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:01:05 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:01:05 +0800 |
commit | 162aedb30b94890935658921b0dd399f43d6cd65 (patch) | |
tree | 98393ff9909339169a81e04767a004283382a9aa /mascara/src/proxy.js | |
parent | ae8486d5cfa2c1d173e0c675408cc6bc00729bd3 (diff) | |
parent | 2885a9547187ce1ad0fb3bed1935387d901942a8 (diff) | |
download | tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.gz tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.bz2 tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.lz tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.xz tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.zst tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.zip |
Merge branch 'master' into new-currency-test
Diffstat (limited to 'mascara/src/proxy.js')
-rw-r--r-- | mascara/src/proxy.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index eabc547b4..5b95175f1 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -1,4 +1,4 @@ -const ParentStream = require('iframe-stream').ParentStream +const createParentStream = require('iframe-stream').ParentStream const SWcontroller = require('client-sw-ready-event/lib/sw-client.js') const SwStream = require('sw-stream/lib/sw-stream.js') const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js') @@ -11,7 +11,7 @@ const background = new SWcontroller({ intervalDelay, }) -const pageStream = new ParentStream() +const pageStream = createParentStream() background.on('ready', (_) => { let swStream = SwStream({ serviceWorker: background.controller, |