aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-09-14 03:14:32 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-14 03:49:44 +0800
commit11363b4f2a3191806995dbb3d1c01fe9ab403f0d (patch)
tree65ae1d71dff6aa4b1b822ed129cd0f1c53d4a984 /app/scripts
parentb13eaaa0cd201704a63e30f3601552c136c9278c (diff)
parente10c651db05c4d2c69618e49db0f24280e93f5ff (diff)
downloadtangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar.gz
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar.bz2
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar.lz
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar.xz
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.tar.zst
tangerine-wallet-browser-11363b4f2a3191806995dbb3d1c01fe9ab403f0d.zip
Merge pull request #655 from MetaMask/FixPortStreamEnd
Fix port stream end bug
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/lib/notifications.js12
-rw-r--r--app/scripts/lib/port-stream.js3
2 files changed, 10 insertions, 5 deletions
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() {
diff --git a/app/scripts/lib/port-stream.js b/app/scripts/lib/port-stream.js
index 1889e3c04..6f59d4485 100644
--- a/app/scripts/lib/port-stream.js
+++ b/app/scripts/lib/port-stream.js
@@ -30,8 +30,7 @@ PortDuplexStream.prototype._onMessage = function (msg) {
PortDuplexStream.prototype._onDisconnect = function () {
try {
- // this.end()
- this.emit('close')
+ this.push(null)
} catch (err) {
this.emit('error', err)
}