Merge pull request #1312 from MetaMask/WakeUp

Wake up
feature/default_network_editable
kumavis 8 years ago committed by GitHub
commit 313d02f2de
  1. 3
      mascara/src/proxy.js
  2. 5
      mascara/src/ui.js
  3. 2
      package.json

@ -3,8 +3,11 @@ const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
const SwStream = require('sw-stream/lib/sw-stream.js') const SwStream = require('sw-stream/lib/sw-stream.js')
const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js') const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js')
let intervalDelay = Math.floor(Math.random() * (60000 - 1000)) + 1000
const background = new SWcontroller({ const background = new SWcontroller({
fileName: '/background.js', fileName: '/background.js',
letBeIdle: false,
intervalDelay,
}) })
const pageStream = new ParentStream() const pageStream = new ParentStream()

@ -18,10 +18,13 @@ const container = document.getElementById('app-content')
var name = 'popup' var name = 'popup'
window.METAMASK_UI_TYPE = name window.METAMASK_UI_TYPE = name
let intervalDelay = Math.floor(Math.random() * (60000 - 1000)) + 1000
const background = new SWcontroller({ const background = new SWcontroller({
fileName: '/background.js', fileName: '/background.js',
letBeIdel: false,
intervalDelay,
}) })
// Setup listener for when the service worker is read // Setup listener for when the service worker is read
background.on('ready', (readSw) => { background.on('ready', (readSw) => {
let connectionStream = SwStream({ let connectionStream = SwStream({

@ -44,7 +44,7 @@
"bluebird": "^3.5.0", "bluebird": "^3.5.0",
"browser-passworder": "^2.0.3", "browser-passworder": "^2.0.3",
"browserify-derequire": "^0.9.4", "browserify-derequire": "^0.9.4",
"client-sw-ready-event": "^1.0.2", "client-sw-ready-event": "^2.2.1",
"clone": "^1.0.2", "clone": "^1.0.2",
"copy-to-clipboard": "^2.0.0", "copy-to-clipboard": "^2.0.0",
"debounce": "^1.0.0", "debounce": "^1.0.0",

Loading…
Cancel
Save