notif - use standard err-first callback style

This commit is contained in:
kumavis 2016-09-02 13:29:47 -07:00
parent 8b37bcf16b
commit 891e17c44c
1 changed files with 24 additions and 18 deletions

View File

@ -9,20 +9,26 @@ module.exports = notifications
window.METAMASK_NOTIFIER = notifications window.METAMASK_NOTIFIER = notifications
function show () { function show () {
getWindows((windows) => { getPopup((err, popup) => {
if (err) throw err
if (popup) {
// bring focus to existing popup
extension.windows.update(popup.id, { focused: true })
} else {
// create new popup
extension.windows.create({
url: 'notification.html',
type: 'popup',
focused: true,
width: 360,
height: 500,
})
if (windows.length > 0) {
const win = windows[0]
return extension.windows.update(win.id, { focused: true })
} }
extension.windows.create({
url: 'notification.html',
type: 'popup',
focused: true,
width: 360,
height: 500,
})
}) })
} }
@ -38,19 +44,19 @@ function getWindows(cb) {
} }
function getPopup(cb) { function getPopup(cb) {
getWindows((windows) => { getWindows((err, windows) => {
cb(getPopupIn(windows)) if (err) throw err
cb(null, getPopupIn(windows))
}) })
} }
function getPopupIn(windows) { function getPopupIn(windows) {
return windows ? windows.find((win) => { return windows ? windows.find((win) => win.type === 'popup') : null
return win.type === 'popup'
}) : null
} }
function closePopup() { function closePopup() {
getPopup((popup) => { getPopup((err, popup) => {
if (err) throw err
if (!popup) return if (!popup) return
extension.windows.remove(popup.id, console.error) extension.windows.remove(popup.id, console.error)
}) })