diff options
author | kumavis <aaron@kumavis.me> | 2016-09-03 04:29:47 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2016-09-03 04:29:47 +0800 |
commit | 891e17c44c9a8ff8b2c794f534018f727dd25d5d (patch) | |
tree | d46d3bb32f8454350ff36a6985ebfa921978ad2c /app | |
parent | 8b37bcf16b4bbc6dcfd24e38f8f6f492555b619a (diff) | |
download | dexon-wallet-891e17c44c9a8ff8b2c794f534018f727dd25d5d.tar.gz dexon-wallet-891e17c44c9a8ff8b2c794f534018f727dd25d5d.tar.zst dexon-wallet-891e17c44c9a8ff8b2c794f534018f727dd25d5d.zip |
notif - use standard err-first callback style
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/lib/notifications.js | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index df4fe73d..4e3f7558 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -9,20 +9,26 @@ module.exports = notifications window.METAMASK_NOTIFIER = notifications function show () { - getWindows((windows) => { + getPopup((err, popup) => { + if (err) throw err - if (windows.length > 0) { - const win = windows[0] - return extension.windows.update(win.id, { focused: true }) - } + if (popup) { + + // bring focus to existing popup + extension.windows.update(popup.id, { focused: true }) + + } else { - extension.windows.create({ - url: 'notification.html', - type: 'popup', - focused: true, - width: 360, - height: 500, - }) + // create new popup + extension.windows.create({ + url: 'notification.html', + type: 'popup', + focused: true, + width: 360, + height: 500, + }) + + } }) } @@ -38,19 +44,19 @@ function getWindows(cb) { } function getPopup(cb) { - getWindows((windows) => { - cb(getPopupIn(windows)) + getWindows((err, windows) => { + if (err) throw err + cb(null, getPopupIn(windows)) }) } function getPopupIn(windows) { - return windows ? windows.find((win) => { - return win.type === 'popup' - }) : null + return windows ? windows.find((win) => win.type === 'popup') : null } function closePopup() { - getPopup((popup) => { + getPopup((err, popup) => { + if (err) throw err if (!popup) return extension.windows.remove(popup.id, console.error) }) |