Merge pull request #1313 from MetaMask/wakeUp2

Wake up2
feature/default_network_editable
kumavis 8 years ago committed by GitHub
commit d7d13caf05
  1. 3
      mascara/src/proxy.js
  2. 6
      mascara/src/ui.js
  3. 2
      package.json

@ -3,10 +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 let intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
const background = new SWcontroller({ const background = new SWcontroller({
fileName: '/background.js', fileName: '/background.js',
letBeIdle: false, letBeIdle: false,
wakeUpInterval: 30000,
intervalDelay, intervalDelay,
}) })

@ -18,12 +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 let intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
const background = new SWcontroller({ const background = new SWcontroller({
fileName: '/background.js', fileName: '/background.js',
letBeIdel: false, letBeIdle: false,
intervalDelay, intervalDelay,
wakeUpInterval: 30000
}) })
// 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) => {
@ -39,6 +40,5 @@ background.on('ready', (readSw) => {
}) })
}) })
}) })
background.startWorker() background.startWorker()
console.log('hello from MetaMascara ui!') console.log('hello from MetaMascara ui!')

@ -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": "^2.2.1", "client-sw-ready-event": "^3.0.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