Merge branch '0.7' of github.com:Flotype/now into 0.7

Flotype · Jul 14, 2011 · b16331f · b16331f
2 parents 336953d + 3543f45
commit b16331f
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/lib/client/now.js b/lib/client/now.js
@@ -316,6 +316,7 @@
         util.emit('rfc', data);
       });
       socket.on('rv', function (data) {
+
         lib.replaceVar(data);
         util.emit('rv', data);
       });
@@ -351,7 +352,6 @@
     },
     processNowScope: function () {
       lib.processScope(now, 'now');
-
       clearTimeout(lastTimeout);
       if (socket.socket.connected)
         lastTimeout = setTimeout(lib.processNowScope, 1000);
@@ -361,8 +361,11 @@
       lib.traverseScope(obj, path, data);
       // Send only for non-empty object
       for (var i in data) {
+
         if(util.hasProperty(data, i) && data[i] !== undefined) {
+
           socket.emit('rv', data);
+
           break;
         }
       }
@@ -371,14 +374,15 @@
       if (obj && typeof obj === 'object') {
         var objIsArray = util.isArray(obj);
         var keys = fqnMap.get(path);
-
+        
         for (var key in obj) {
           var fqn = path + '.' + key;
           var val = obj[key];
-
+          
           if (fqn === 'now.core' || fqn === 'now.ready') {
             continue;
           }
+
           var type = typeof val;
           if (util.hasProperty(obj, key)) {
             if (isIE || objIsArray) {
@@ -431,10 +435,13 @@
     socket.on('connect', function () {
       now.core.clientId = socket.socket.sessionid;
       lib.handleNewConnection(socket);
-
       // Begin intermittent scope traversal
-      lib.processNowScope();
-      socket.emit('rd');
+
+      setTimeout(function(){
+        lib.processNowScope();
+        socket.emit('rd');
+      }, 100);
+
       util.emit('connect');
     });
     socket.on('disconnect', function () {