Fix subscriptions readiness handling

inProgress-team · Sep 20, 2016 · 34fab1e · 34fab1e
1 parent b501330
commit 34fab1e
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Meteor.js b/src/Meteor.js
@@ -137,14 +137,20 @@ module.exports = {
     });
 
     Data.ddp.on("ready", message => {
-
+      const idsMap = new Map();
       for(var i in Data.subscriptions) {
         const sub = Data.subscriptions[i];
-        sub.ready = true;
-        sub.readyDeps.changed();
-        sub.readyCallback && sub.readyCallback();
+        idsMap.set(sub.subIdRemember, sub.id);
+      }
+      for(var i in message.subs) {
+        const subId = idsMap.get(message.subs[i]);
+        if(subId){
+          const sub = Data.subscriptions[subId];
+          sub.ready = true;
+          sub.readyDeps.changed();
+          sub.readyCallback && sub.readyCallback();
+        }
       }
-
     });
 
     Data.ddp.on("changed", message => {