Do not render when model has errored

derbyjs · Aug 14, 2015 · 1c84fc4 · 1c84fc4
1 parent 87ec3db
commit 1c84fc4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/App.server.js b/lib/App.server.js
@@ -71,7 +71,10 @@ App.prototype.createPage = function(req, res, next) {
   this.emit('model', model);
   var page = new this.Page(this, model, req, res);
   if (next) {
-    model.on('error', next);
+    model.on('error', function(err){
+      model.hasErrored = true;
+      next(err);
+    });
     page.on('error', next);
   }
   return page;

diff --git a/lib/Page.server.js b/lib/Page.server.js
@@ -21,6 +21,7 @@ Page.prototype.render = function(status, ns) {
   var page = this;
   this.model.destroy('$components');
   this.model.bundle(function(err, bundle) {
+    if (page.model.hasErrored) return;
     if (err) return page.emit('error', err);
     var scripts = '<script async src="' + page.app.scriptUrl + '"></script>' +
       '<script type="application/json">' + stringifyBundle(bundle) + '</script>';