Permalink
Browse files

Merge branch 'master' of github.com:Flotype/now

  • Loading branch information...
2 parents 632756d + 209abed commit b7075c5fbc168b3fa1bfe16502653eced3ebb04b @ericz ericz committed Apr 29, 2011
Showing with 6 additions and 3 deletions.
  1. +0 −1 examples/helloworld_example/helloworld_server.js
  2. +6 −2 lib/nowUtil.js
@@ -11,7 +11,6 @@ var everyone = require("now").initialize(server);
everyone.connected(function(){
- // This may show up as undefined in IE, Firefox, Safari, because alert boxes are not blocking
console.log("Joined: " + this.now.name);
});
View
@@ -383,7 +383,9 @@
for (i = 0; i < value.length; i += 1) {
values = derez(value[i], path + '[' + i + ']', fqn+"."+i);
for(j in values) {
- nu[j][i] = values[j];
+ if (values.hasOwnProperty(j)) {
+ nu[j][i] = values[j];
+ }
}
}
} else {
@@ -395,7 +397,9 @@
if (Object.prototype.hasOwnProperty.call(value, name)) {
values = derez(value[name], path + '[' + JSON.stringify(name) + ']', fqn+"."+name);
for(j in values) {
- nu[j][name] = values[j];
+ if (values.hasOwnProperty(j)) {
+ nu[j][name] = values[j];
+ }
}
}
}

0 comments on commit b7075c5

Please sign in to comment.