Object fixes

jherdman · Jun 1, 2010 · 06769c4 · 06769c4
1 parent df876e3
commit 06769c4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/socket.io/util/object.js b/lib/socket.io/util/object.js
@@ -27,10 +27,8 @@ var mergeOne = function(source, key, current){
 		source[key] = exports.clone(current);
 	} else if (typeof current === 'object'){
 		if (typeof source[key] === 'object') {
-			// TODO what should object be? it doesn't exist in this file
-			object.merge(source[key], current);
-		}
-		else {
+			exports.merge(source[key], current);
+		} else {
 			source[key] = exports.clone(current);
 		}
 	} else {