diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 6 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 62dc166a7..54ac629e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix formatting of ETH balance - Fix formatting of account details. +- Use web3 minified dist for faster inject times - Fix issue where dropdowns were not in front of icons. ## 2.5.0 2016-06-29 diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index f4f064163..8b46f603c 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -1,14 +1,13 @@ const LocalMessageDuplexStream = require('./lib/local-message-stream.js') const PortStream = require('./lib/port-stream.js') const ObjectMultiplex = require('./lib/obj-multiplex') -// const urlUtil = require('url') if (shouldInjectWeb3()) { setupInjection() + setTimeout(setupStreams, 200) } function setupInjection(){ - // inject in-page script var scriptTag = document.createElement('script') scriptTag.src = chrome.extension.getURL('scripts/inpage.js') @@ -16,6 +15,9 @@ function setupInjection(){ var container = document.head || document.documentElement // append as first child container.insertBefore(scriptTag, container.children[0]) +} + +function setupStreams(){ // setup communication to page and plugin var pageStream = new LocalMessageDuplexStream({ diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index e6f4078c8..f5e54cd7b 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -1,12 +1,11 @@ +/*global Web3*/ cleanContextForImports() -const Web3 = require('web3') +require('web3/dist/web3.min.js') const LocalMessageDuplexStream = require('./lib/local-message-stream.js') const setupDappAutoReload = require('./lib/auto-reload.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js') restoreContextAfterImports() -// remove from window -delete window.Web3 // // setup plugin communication |