notif - use standard err-first callback style

feature/default_network_editable
kumavis 8 years ago
parent 8b37bcf16b
commit 891e17c44c
  1. 28
      app/scripts/lib/notifications.js

@ -9,13 +9,17 @@ 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 (windows.length > 0) { if (popup) {
const win = windows[0]
return extension.windows.update(win.id, { focused: true }) // bring focus to existing popup
} extension.windows.update(popup.id, { focused: true })
} else {
// create new popup
extension.windows.create({ extension.windows.create({
url: 'notification.html', url: 'notification.html',
type: 'popup', type: 'popup',
@ -23,6 +27,8 @@ function show () {
width: 360, width: 360,
height: 500, 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)
}) })

Loading…
Cancel
Save