Permalink
Browse files

Object fixes

  • Loading branch information...
rauchg committed Jun 1, 2010
1 parent df876e3 commit 06769c4ca77c6552ec390217f6f2c068481f93b3
Showing with 2 additions and 4 deletions.
  1. +2 −4 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 {

0 comments on commit 06769c4

Please sign in to comment.