Merge pull request ember-fastboot#41 from danmcclain/deferred-rendering

Defer rendering via promise chaining

Author: tomdale

lib/ember-app.js

@@ -86,6 +86,13 @@ EmberApp.prototype.visit = function(path, options) {
     .then(function(instance) {
       return instance.visit(path, bootOptions);
     })
+    .then(function(instance) {
+      var fastbootInfo = instance.lookup('info:-fastboot');
+
+      return fastbootInfo.deferredPromise.then(function() {
+        return instance;
+      });
+    })
     .then(serializeHTML(doc, rootElement));
 };
 

lib/fastboot-info.js

@@ -1,3 +1,4 @@
+var RSVP = require('rsvp');
 var FastBootRequest = require('./fastboot-request');
 
 /*
@@ -7,9 +8,16 @@ var FastBootRequest = require('./fastboot-request');
  */
 function FastBootInfo(request, response, hostWhitelist) {
   this.response = response;
+  this.deferredPromise = RSVP.resolve();
   this.request = new FastBootRequest(request, hostWhitelist);
 }
 
+FastBootInfo.prototype.deferRendering = function(promise) {
+  this.deferredPromise = this.deferredPromise.then(function() {
+    return promise;
+  });
+}
+
 /*
  * Registers this FastBootInfo instance in the registry of an Ember
  * ApplicationInstance. It is configured to be injected into the FastBoot