From 610ec2bdf5841c8275073992e67c59fb47faa48c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 29 Mar 2017 10:40:57 -0700
Subject: Fix popup behavior for Firefox

Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already.
---
 app/scripts/lib/notifications.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/scripts/lib/notifications.js')

diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 3db1ac6b5..33914846c 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -22,10 +22,12 @@ function show () {
       extension.windows.create({
         url: 'notification.html',
         type: 'popup',
-        focused: true,
         width,
         height,
       })
+      .catch((reason) => {
+        log.error("failed to create poupup", reason)
+      })
     }
   })
 }
-- 
cgit v1.2.3


From 98dd684524fde7548442830fe01e1f3e24a6e67d Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 29 Mar 2017 10:42:43 -0700
Subject: Linted

---
 app/scripts/lib/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/lib/notifications.js')

diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 33914846c..0ec01f3a7 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -26,7 +26,7 @@ function show () {
         height,
       })
       .catch((reason) => {
-        log.error("failed to create poupup", reason)
+        log.error('failed to create poupup', reason)
       })
     }
   })
-- 
cgit v1.2.3


From 5036263f88a1f61957982b64d27472a516c28def Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 30 Mar 2017 18:33:19 -0700
Subject: introduce platform api and rename notifications to
 notification-manager

---
 app/scripts/lib/notifications.js | 67 ----------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 app/scripts/lib/notifications.js

(limited to 'app/scripts/lib/notifications.js')

diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
deleted file mode 100644
index 0ec01f3a7..000000000
--- a/app/scripts/lib/notifications.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const extension = require('./extension')
-const height = 520
-const width = 360
-
-const notifications = {
-  show,
-  getPopup,
-  closePopup,
-}
-module.exports = notifications
-window.METAMASK_NOTIFIER = notifications
-
-function show () {
-  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',
-        width,
-        height,
-      })
-      .catch((reason) => {
-        log.error('failed to create poupup', reason)
-      })
-    }
-  })
-}
-
-function getWindows (cb) {
-  // Ignore in test environment
-  if (!extension.windows) {
-    return cb()
-  }
-
-  extension.windows.getAll({}, (windows) => {
-    cb(null, windows)
-  })
-}
-
-function getPopup (cb) {
-  getWindows((err, windows) => {
-    if (err) throw err
-    cb(null, getPopupIn(windows))
-  })
-}
-
-function getPopupIn (windows) {
-  return windows ? windows.find((win) => {
-    return (win && win.type === 'popup' &&
-      win.height === height &&
-      win.width === width)
-  }) : null
-}
-
-function closePopup () {
-  getPopup((err, popup) => {
-    if (err) throw err
-    if (!popup) return
-    extension.windows.remove(popup.id, console.error)
-  })
-}
-- 
cgit v1.2.3