fixed cross-port bugs

tdegrunt · Mar 12, 2011 · b67f083 · b67f083
1 parent a09d77d
commit b67f083
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/lib/now.js b/lib/now.js
@@ -38,6 +38,10 @@ window.onload = function(){
 
     now = nowCore.scopes[SERVER_ID];
 
+    var ready = nowOld.ready;
+
+    delete nowOld.ready;
+
     nowUtil.initializeScope(nowOld, socket);
 
     nowUtil.addChildrenToBlacklist(nowCore.watchersBlacklist[SERVER_ID], nowOld, "now");
@@ -52,7 +56,7 @@ window.onload = function(){
 
 
     // Call the ready handlers
-    now.ready();
+    ready();
   });
 
   var socket = new io.Socket('**SERVER**', {port: **PORT**}); 

diff --git a/lib/nowServerLib.js b/lib/nowServerLib.js
@@ -100,16 +100,6 @@ function serveFile(filename, request, response){
 }
 
 
-
-
-
-
-
-
-
-
-
-
 exports.handleNewConnection = function(client){
 
   client.on('message', function(message){

diff --git a/lib/nowUtil.js b/lib/nowUtil.js
@@ -236,9 +236,7 @@ nowUtil.mergeScopes = function(current, incoming) {
       }
       nowUtil.mergeScopes(current[prop], incoming[prop]);
     } else {
-      if(!current.hasOwnProperty(prop)){
-        current[prop] = incoming[prop];
-      }
+      current[prop] = incoming[prop];
     }
   }
 }