m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev

Browse Source
This commit is contained in:
Dan Finlay 2016-05-23 14:38:13 -07:00
commit a439e04ed4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scripts/contentscript.js
View File

@ -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' })
})

4
app/scripts/inpage.js
View File

@ -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){