diff options
| -rw-r--r-- | app/scripts/contentscript.js | 10 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index f4f064163..44cac3b0a 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,13 @@ function setupInjection(){ var container = document.head || document.documentElement // append as first child container.insertBefore(scriptTag, container.children[0]) +} + +function setupStreams(){ + + const LocalMessageDuplexStream = require('./lib/local-message-stream.js') + const PortStream = require('./lib/port-stream.js') + const ObjectMultiplex = require('./lib/obj-multiplex') // setup communication to page and plugin var pageStream = new LocalMessageDuplexStream({ diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index e6f4078c8..40dce54f1 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -1,12 +1,10 @@ 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 |