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

Resolving that ugly merge.

Browse Source
This commit is contained in:
Kevin Serrano 2017-10-25 15:45:26 -07:00
parent 2489caddd4
commit b9bbf8f329
No known key found for this signature in database
GPG Key ID: BF999DEFC7371BA1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scripts/inpage.js
View File

@ -1,6 +1,7 @@
/*global Web3*/ /*global Web3*/
cleanContextForImports() cleanContextForImports()
require('web3/dist/web3.min.js') require('web3/dist/web3.min.js')
const log = require('loglevel')
const LocalMessageDuplexStream = require('post-message-stream') const LocalMessageDuplexStream = require('post-message-stream')
// const PingStream = require('ping-pong-stream/ping') // const PingStream = require('ping-pong-stream/ping')
// const endOfStream = require('end-of-stream') // const endOfStream = require('end-of-stream')
@ -8,6 +9,10 @@ const setupDappAutoReload = require('./lib/auto-reload.js')
const MetamaskInpageProvider = require('./lib/inpage-provider.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js')
restoreContextAfterImports() restoreContextAfterImports()
const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
window.log = log
log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
// //
// setup plugin communication // setup plugin communication
@ -28,9 +33,9 @@ var inpageProvider = new MetamaskInpageProvider(metamaskStream)
var web3 = new Web3(inpageProvider) var web3 = new Web3(inpageProvider)
web3.setProvider = function () { web3.setProvider = function () {
console.log('MetaMask - overrode web3.setProvider') log.debug('MetaMask - overrode web3.setProvider')
} }
console.log('MetaMask - injected web3') log.debug('MetaMask - injected web3')
// export global web3, with usage-detection // export global web3, with usage-detection
setupDappAutoReload(web3, inpageProvider.publicConfigStore) setupDappAutoReload(web3, inpageProvider.publicConfigStore)
@ -65,4 +70,3 @@ function restoreContextAfterImports () {
console.warn('MetaMask - global.define could not be overwritten.') console.warn('MetaMask - global.define could not be overwritten.')
} }
} }