aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-04-07 04:02:32 +0800
committerGitHub <noreply@github.com>2017-04-07 04:02:32 +0800
commitd7d13caf05f027dca86882db0a72625db8da167c (patch)
treef72d3b613b4789458f41b1918e1f69d67afe36c1
parent313d02f2deb64324de466bffb0098735706494de (diff)
parent65979ba86e68264657a593cd106d40fbe700b216 (diff)
downloadtangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar.gz
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar.bz2
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar.lz
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar.xz
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.tar.zst
tangerine-wallet-browser-d7d13caf05f027dca86882db0a72625db8da167c.zip
Merge pull request #1313 from MetaMask/wakeUp2
Wake up2
-rw-r--r--mascara/src/proxy.js3
-rw-r--r--mascara/src/ui.js6
-rw-r--r--package.json2
3 files changed, 6 insertions, 5 deletions
diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js
index 5ead75f94..ec5665240 100644
--- a/mascara/src/proxy.js
+++ b/mascara/src/proxy.js
@@ -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 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({
fileName: '/background.js',
letBeIdle: false,
+ wakeUpInterval: 30000,
intervalDelay,
})
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index 37bb043b8..2873017cb 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -18,12 +18,13 @@ const container = document.getElementById('app-content')
var name = 'popup'
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({
fileName: '/background.js',
- letBeIdel: false,
+ letBeIdle: false,
intervalDelay,
+ wakeUpInterval: 30000
})
// Setup listener for when the service worker is read
background.on('ready', (readSw) => {
@@ -39,6 +40,5 @@ background.on('ready', (readSw) => {
})
})
})
-
background.startWorker()
console.log('hello from MetaMascara ui!')
diff --git a/package.json b/package.json
index 67648d781..b892653fa 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"bluebird": "^3.5.0",
"browser-passworder": "^2.0.3",
"browserify-derequire": "^0.9.4",
- "client-sw-ready-event": "^2.2.1",
+ "client-sw-ready-event": "^3.0.1",
"clone": "^1.0.2",
"copy-to-clipboard": "^2.0.0",
"debounce": "^1.0.0",