aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/obj-multiplex.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-10-13 04:52:32 +0800
committerGitHub <noreply@github.com>2016-10-13 04:52:32 +0800
commit8d5b2478e3aa939cb4b0a58b20b199cded62769e (patch)
treeb287ae4a264fd29f5ec8b5fe2c97564fb80f62f8 /app/scripts/lib/obj-multiplex.js
parentf68673e84ac48c5574b642b3b779d4d43954d98f (diff)
parent465cff78c33385c7f108e7539f484119f7a03767 (diff)
downloadtangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar.gz
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar.bz2
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar.lz
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar.xz
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.tar.zst
tangerine-wallet-browser-8d5b2478e3aa939cb4b0a58b20b199cded62769e.zip
Merge pull request #730 from MetaMask/i695-dapp-reload
dapp reload - fixed disconnect detection via polling
Diffstat (limited to 'app/scripts/lib/obj-multiplex.js')
-rw-r--r--app/scripts/lib/obj-multiplex.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/scripts/lib/obj-multiplex.js b/app/scripts/lib/obj-multiplex.js
index f54ff7653..bd114c394 100644
--- a/app/scripts/lib/obj-multiplex.js
+++ b/app/scripts/lib/obj-multiplex.js
@@ -10,9 +10,9 @@ function ObjectMultiplex (opts) {
var data = chunk.data
var substream = mx.streams[name]
if (!substream) {
- console.warn('orphaned data for stream ' + name)
+ console.warn(`orphaned data for stream "${name}"`)
} else {
- substream.push(data)
+ if (substream.push) substream.push(data)
}
return cb()
})
@@ -36,5 +36,9 @@ function ObjectMultiplex (opts) {
}
return substream
}
+ // ignore streams (dont display orphaned data warning)
+ mx.ignoreStream = function (name) {
+ mx.streams[name] = true
+ }
return mx
}