diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
| commit | c20c97ce625207c7afcd48a12f6e7891d582ae99 (patch) | |
| tree | b5e063ee7cfd0d0e99fcdb0409fe3106c010bf79 /app/scripts/inpage.js | |
| parent | eeb9390de81ce6fc92247d5c499e991dce8330bd (diff) | |
| parent | 00efcf9e8ba34d448b628c98d32ad12d5be2ffc9 (diff) | |
| download | tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.gz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.bz2 tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.lz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.xz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.zst tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.zip | |
Merge branch 'master' into tx-controller-rewrite-v3
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ec99bfc35..92c732813 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -3,16 +3,11 @@ cleanContextForImports() require('web3/dist/web3.min.js') const log = require('loglevel') const LocalMessageDuplexStream = require('post-message-stream') -// const PingStream = require('ping-pong-stream/ping') -// const endOfStream = require('end-of-stream') const setupDappAutoReload = require('./lib/auto-reload.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js') restoreContextAfterImports() -const METAMASK_DEBUG = process.env.METAMASK_DEBUG -window.log = log -log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn') - +log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn') // // setup plugin communication |