Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
michelle committed Apr 5, 2013
1 parent a6c5fd9 commit 28a7d4b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
15 changes: 6 additions & 9 deletions dist/peer.js
Expand Up @@ -1312,7 +1312,7 @@ Peer.prototype._handleServerJSONMessage = function(message) {
manager = new ConnectionManager(this.id, peer, this._socket, options);
this._attachManagerListeners(manager);
this.managers[peer] = manager;
this.connections[peer] = {};
this.connections[peer] = manager.connections;
}
manager.update(options.labels);
manager.handleSDP(payload.sdp, message.type);
Expand Down Expand Up @@ -1365,13 +1365,13 @@ Peer.prototype._attachManagerListeners = function(manager) {
var self = this;
// Handle receiving a connection.
manager.on('connection', function(connection) {
self.connections[connection.peer][connection.label] = connection;
self.emit('connection', connection);
});
// Handle a connection closing.
manager.on('close', function() {
if (!!self.managers[manager.peer]) {
delete self.managers[manager.peer]
delete self.managers[manager.peer];
delete self.connections[manager.peer];
}
});
manager.on('error', function(err) {
Expand Down Expand Up @@ -1425,15 +1425,12 @@ Peer.prototype.connect = function(peer, options) {
this.connections[peer] = {};
}

var connectionInfo = manager.connect(options);
if (!!connectionInfo) {
this.connections[peer][connectionInfo[0]] = connectionInfo[1];
}
var connection = manager.connect(options);

if (!this.id) {
this._queued.push(manager);
}
return connectionInfo[1];
return connection;
};

/**
Expand Down Expand Up @@ -1959,7 +1956,7 @@ ConnectionManager.prototype.connect = function(options) {
}

this._lock = true
return [options.label, connection];
return connection;
};

/** Updates label:[serialization, reliable, metadata] pairs from offer. */
Expand Down

0 comments on commit 28a7d4b

Please sign in to comment.