aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-09-02 03:07:28 +0800
committerGitHub <noreply@github.com>2017-09-02 03:07:28 +0800
commit2885a9547187ce1ad0fb3bed1935387d901942a8 (patch)
tree0d30f656ec4f87a8f96fc4029775cfe691a61fa5
parent33dfed15a63659454305eb642f8430c6aeebed31 (diff)
parentdbcc82f5c42a212e02ec33efb428fef15e0d72aa (diff)
downloadtangerine-wallet-browser-2885a9547187ce1ad0fb3bed1935387d901942a8.tar.gz
tangerine-wallet-browser-2885a9547187ce1ad0fb3bed1935387d901942a8.tar.zst
tangerine-wallet-browser-2885a9547187ce1ad0fb3bed1935387d901942a8.zip
Merge pull request #2008 from MetaMask/mascara-fix
mascara - fix iframe stream constructor
-rw-r--r--mascara/src/lib/setup-iframe.js4
-rw-r--r--mascara/src/proxy.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/mascara/src/lib/setup-iframe.js b/mascara/src/lib/setup-iframe.js
index db67163df..dcf404574 100644
--- a/mascara/src/lib/setup-iframe.js
+++ b/mascara/src/lib/setup-iframe.js
@@ -1,5 +1,5 @@
const Iframe = require('iframe')
-const IframeStream = require('iframe-stream').IframeStream
+const createIframeStream = require('iframe-stream').IframeStream
module.exports = setupIframe
@@ -13,7 +13,7 @@ function setupIframe(opts) {
})
var iframe = frame.iframe
iframe.style.setProperty('display', 'none')
- var iframeStream = new IframeStream(iframe)
+ var iframeStream = createIframeStream(iframe)
return iframeStream
}
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,