Use same onack function like it is in the server code.

tobiasmuecksch · Apr 2, 2015 · 9115a5f · 9115a5f
1 parent 63cf9e7
commit 9115a5f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/lib/socket.js b/lib/socket.js
@@ -296,14 +296,14 @@ Socket.prototype.ack = function(id){
  */
 
 Socket.prototype.onack = function(packet){
-  debug('calling ack %s with %j', packet.id, packet.data);
-  if (this.acks[packet.id]) {
-    var fn = this.acks[packet.id];
-    fn.apply(this, packet.data);
-    delete this.acks[packet.id];
-  } else {
-    // FIXME: is this an issue if the packet id does not exist in the acks?
-  }
+    var ack = this.acks[packet.id];
+    if ('function' == typeof ack) {
+        debug('calling ack %s with %j', packet.id, packet.data);
+        ack.apply(this, packet.data);
+        delete this.acks[packet.id];
+    } else {
+        debug('bad ack %s', packet.id);
+    }
 };
 
 /**

diff --git a/socket.io.js b/socket.io.js
@@ -927,14 +927,14 @@ Socket.prototype.ack = function(id){
  */
 
 Socket.prototype.onack = function(packet){
-  debug('calling ack %s with %j', packet.id, packet.data);
-  if (this.acks[packet.id]) {
-    var fn = this.acks[packet.id];
-    fn.apply(this, packet.data);
-    delete this.acks[packet.id];
-  } else {
-    // FIXME: is this an issue if the packet id does not exist in the acks?
-  }
+    var ack = this.acks[packet.id];
+    if ('function' == typeof ack) {
+        debug('calling ack %s with %j', packet.id, packet.data);
+        ack.apply(this, packet.data);
+        delete this.acks[packet.id];
+    } else {
+        debug('bad ack %s', packet.id);
+    }
 };
 
 /**