diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-09-14 04:14:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 04:14:14 +0800 |
| commit | d05dfc4eedaeb9000693748ab668479b392f3228 (patch) | |
| tree | 2275151d2dc2ae2a847cfa7c960d6de174dbcaf6 | |
| parent | 3b2182f576948e4ab57d23c2161227178f5dc20c (diff) | |
| parent | b624155e60c713e5e1de67b51bf34083ecfed0ef (diff) | |
| download | tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar.gz tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar.bz2 tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar.lz tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar.xz tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.tar.zst tangerine-wallet-browser-d05dfc4eedaeb9000693748ab668479b392f3228.zip | |
Merge pull request #656 from MetaMask/i646-ClosePopupBug
Fix popup closing bug
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/scripts/lib/notifications.js | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f83ed86e8..862bf3d7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +- Fixed bug where opening MetaMask could close a non-metamask popup. +- Fixed memory leak that caused occasional crashes. + - Add a QR button to the Account detail screen ## 2.11.1 2016-09-12 diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 4e3f7558c..422f46f6d 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -1,4 +1,6 @@ const extension = require('./extension') +const height = 500 +const width = 360 const notifications = { show, @@ -24,8 +26,8 @@ function show () { url: 'notification.html', type: 'popup', focused: true, - width: 360, - height: 500, + width, + height, }) } @@ -51,7 +53,11 @@ function getPopup(cb) { } function getPopupIn(windows) { - return windows ? windows.find((win) => win.type === 'popup') : null + return windows ? windows.find((win) => { + return (win && win.type === 'popup' && + win.height === height && + win.width === width) + }) : null } function closePopup() { |