summaryrefslogtreecommitdiff
path: root/objects.js
diff options
context:
space:
mode:
authorCode WvS <code-wvs@quantentunnel.de>2015-03-08 16:14:05 +0100
committerCode WvS <code-wvs@quantentunnel.de>2015-03-08 16:14:05 +0100
commit2e42f45c504d4224424c1da18fea04d7bbe609c6 (patch)
tree1290a1f98a6dc07ff066159926e6a11311f95820 /objects.js
parent0af3c31381d3386fc737e63a7087da77beaafce5 (diff)
parent916dfe65e4afe636ce42e178fe88815b4b86026d (diff)
downloadsnap-yow-2e42f45c504d4224424c1da18fea04d7bbe609c6.tar.gz
snap-yow-2e42f45c504d4224424c1da18fea04d7bbe609c6.zip
Merge branch 'p2p' into gh-pages
Diffstat (limited to 'objects.js')
-rw-r--r--objects.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/objects.js b/objects.js
index 3f64e9f..0276f8f 100644
--- a/objects.js
+++ b/objects.js
@@ -4559,11 +4559,9 @@ StageMorph.prototype.init = function (globals) {
StageMorph.prototype.initPeering = function (id) {
var myself = this;
- if (window.peers) {
+ if (window.peer) {
// I don't know why, but it works.
- while (window.peers.length > 0) {
- window.peers.pop().destroy();
- }
+ window.peer.destroy();
}
this.peer = new Peer(id, {
@@ -4573,13 +4571,10 @@ StageMorph.prototype.initPeering = function (id) {
path: '/'
});
- this.peer.on('open', function (id) {
- myself.peerId = id;
- });
this.peer.on('disconnected', function () {
// peer.reconnect does not work (?) because 'id' is undefined
if (!myself.peer.destroyed) {
- myself.initPeering(myself.peerId);
+ myself.initPeering(myself.peer.id);
}
});
this.peer.on('error', function (err) {
@@ -4594,7 +4589,7 @@ StageMorph.prototype.initPeering = function (id) {
});
});
- window.peers.push(this.peer);
+ window.peer = this.peer;
};
StageMorph.prototype.newPeerMessage = function (data, peer) {