diff options
author | kumavis <aaron@kumavis.me> | 2018-03-22 02:55:09 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-03-22 02:55:09 +0800 |
commit | 5d3246c836f3634f2b78bc1d511a797c4d3c9ee7 (patch) | |
tree | 0546f12279fb855a3b148a785a3c49e8312ea064 /app/scripts/lib | |
parent | ec1188f25017b6b352744646aee61155d84fc999 (diff) | |
parent | 93495b28098701e5558052b7f39c39993dc64911 (diff) | |
download | tangerine-wallet-browser-5d3246c836f3634f2b78bc1d511a797c4d3c9ee7.tar.gz tangerine-wallet-browser-5d3246c836f3634f2b78bc1d511a797c4d3c9ee7.tar.zst tangerine-wallet-browser-5d3246c836f3634f2b78bc1d511a797c4d3c9ee7.zip |
Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master
Diffstat (limited to 'app/scripts/lib')
-rw-r--r-- | app/scripts/lib/notification-manager.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/scripts/lib/notification-manager.js b/app/scripts/lib/notification-manager.js index adaf60c65..1fcb7cf69 100644 --- a/app/scripts/lib/notification-manager.js +++ b/app/scripts/lib/notification-manager.js @@ -13,11 +13,12 @@ class NotificationManager { this._getPopup((err, popup) => { if (err) throw err + // Bring focus to chrome popup if (popup) { - // bring focus to existing popup + // bring focus to existing chrome popup extension.windows.update(popup.id, { focused: true }) } else { - // create new popup + // create new notification popup extension.windows.create({ url: 'notification.html', type: 'popup', @@ -29,6 +30,7 @@ class NotificationManager { } closePopup () { + // closes notification popup this._getPopup((err, popup) => { if (err) throw err if (!popup) return @@ -60,9 +62,8 @@ class NotificationManager { _getPopupIn (windows) { return windows ? windows.find((win) => { - return (win && win.type === 'popup' && - win.height === height && - win.width === width) + // Returns notification popup + return (win && win.type === 'popup') }) : null } |