Merge

changelog.md

@@ -1,13 +1,17 @@
 # PeerJS Changelog
 
-## Version 0.3.2 (25 Oct 2013)
+## Version 0.3.3 beta (2 Nov 2013)
+* Fix exceptions when peer emits errors upon creation
+* Remove extra commas
+
+## Version 0.3.2 beta (25 Oct 2013)
 * Use SCTP in Chrome 31+.
 * Work around Chrome 31+ tab crash. The crashes were due to Chrome's lack of support for the `maxRetransmits` parameter for modifying SDP.
 * Fix exceptions in Chrome 29 and below.
 * DataChannels are unreliable by default in Chrome 30 and below. In setting
   reliable to `true`, the reliable shim is used only in Chrome 30 and below.
 
-## Version 0.3.1 (19 Oct 2013)
+## Version 0.3.1 beta (19 Oct 2013)
 * Updated docs and examples for TURN server usage
 * Fixed global variable leak
 * DataConnections now have reliable: false by default. This will switch to on when reliable: true works in more browsers

dist/peer.js

@@ -1,4 +1,4 @@
-/*! peerjs.js build:0.3.2, development. Copyright(c) 2013 Michelle Bu <michelle@michellebu.com> */
+/*! peerjs.js build:0.3.3, development. Copyright(c) 2013 Michelle Bu <michelle@michellebu.com> */
 (function(exports){
 var binaryFeatures = {};
 binaryFeatures.useBlobBuilder = (function(){
@@ -1527,7 +1527,7 @@ Peer.prototype._handleMessage = function(message) {
           var connection = new MediaConnection(peer, this, {
             connectionId: connectionId,
             _payload: payload,
-            metadata: payload.metadata,
+            metadata: payload.metadata
           });
           this._addConnection(peer, connection);
           this.emit('call', connection);
@@ -1689,11 +1689,12 @@ Peer.prototype.destroy = function() {
 
 /** Disconnects every connection on this peer. */
 Peer.prototype._cleanup = function() {
-  var peers = Object.keys(this.connections);
-  for (var i = 0, ii = peers.length; i < ii; i++) {
-    this._cleanupPeer(peers[i]);
+  if (this.connections) {
+    var peers = Object.keys(this.connections);
+    for (var i = 0, ii = peers.length; i < ii; i++) {
+      this._cleanupPeer(peers[i]);
+    }
   }
-
   this.emit('close');
 }
 
@@ -2159,7 +2160,7 @@ Negotiator._setupListeners = function(connection, pc, pc_id) {
           type: connection.type,
           connectionId: connection.id
         },
-        dst: peerId,
+        dst: peerId
       });
     }
   };
@@ -2245,7 +2246,7 @@ Negotiator._makeOffer = function(connection) {
           connectionId: connection.id,
           sctp: util.supports.sctp
         },
-        dst: connection.peer,
+        dst: connection.peer
       });
     }, function(err) {
       connection.provider.emit('error', err);

lib/negotiator.js

@@ -134,7 +134,7 @@ Negotiator._setupListeners = function(connection, pc, pc_id) {
           type: connection.type,
           connectionId: connection.id
         },
-        dst: peerId,
+        dst: peerId
       });
     }
   };
@@ -220,7 +220,7 @@ Negotiator._makeOffer = function(connection) {
           connectionId: connection.id,
           sctp: util.supports.sctp
         },
-        dst: connection.peer,
+        dst: connection.peer
       });
     }, function(err) {
       connection.provider.emit('error', err);

lib/peer.js

@@ -180,7 +180,7 @@ Peer.prototype._handleMessage = function(message) {
           var connection = new MediaConnection(peer, this, {
             connectionId: connectionId,
             _payload: payload,
-            metadata: payload.metadata,
+            metadata: payload.metadata
           });
           this._addConnection(peer, connection);
           this.emit('call', connection);
@@ -342,11 +342,12 @@ Peer.prototype.destroy = function() {
 
 /** Disconnects every connection on this peer. */
 Peer.prototype._cleanup = function() {
-  var peers = Object.keys(this.connections);
-  for (var i = 0, ii = peers.length; i < ii; i++) {
-    this._cleanupPeer(peers[i]);
+  if (this.connections) {
+    var peers = Object.keys(this.connections);
+    for (var i = 0, ii = peers.length; i < ii; i++) {
+      this._cleanupPeer(peers[i]);
+    }
   }
-
   this.emit('close');
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "peerjs",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "PeerJS client",
   "repository": {
     "type": "git",