aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-05-23 09:21:34 +0800
committerkumavis <aaron@kumavis.me>2016-05-23 09:21:34 +0800
commit9aea88da3255a470e1833de5d356a159cd9bea0e (patch)
tree034de5e286ff47b7e79984f0267c552942b50ecf /app
parent2a62d63b4f70bea12126e4b15d78ebbf9dbddefb (diff)
downloadtangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar.gz
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar.bz2
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar.lz
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar.xz
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.tar.zst
tangerine-wallet-browser-9aea88da3255a470e1833de5d356a159cd9bea0e.zip
multiplex - rename control to autoreload
Diffstat (limited to 'app')
-rw-r--r--app/scripts/contentscript.js8
-rw-r--r--app/scripts/inpage.js4
2 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 1b7b98ec9..43ae5bc98 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -25,14 +25,14 @@ pluginStream.on('error', console.error.bind(console))
// forward communication plugin->inpage
pageStream.pipe(pluginStream).pipe(pageStream)
-// connect contentscript->inpage control stream
+// connect contentscript->inpage reload stream
var mx = ObjectMultiplex()
mx.on('error', console.error.bind(console))
mx.pipe(pageStream)
-var controlStream = mx.createStream('control')
-controlStream.on('error', console.error.bind(console))
+var reloadStream = mx.createStream('reload')
+reloadStream.on('error', console.error.bind(console))
// if we lose connection with the plugin, trigger tab refresh
pluginStream.on('close', function(){
- controlStream.write({ method: 'reset' })
+ reloadStream.write({ method: 'reset' })
}) \ No newline at end of file
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 652a95d7c..b8532747e 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -36,8 +36,8 @@ console.log('MetaMask - injected web3')
// export global web3 with auto dapp reload
//
-var controlStream = inpageProvider.multiStream.createStream('control')
-setupDappAutoReload(web3, controlStream)
+var reloadStream = inpageProvider.multiStream.createStream('reload')
+setupDappAutoReload(web3, reloadStream)
// set web3 defaultAcount
inpageProvider.publicConfigStore.subscribe(function(state){