Merge pull request derbyjs#1 from codeparty/master

Pull upstream changes
lefnire · Apr 10, 2013 · 1ad8535 · 1ad8535
2 parents 1dd1747 + 59817f1
commit 1ad8535
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/derby.browser.js b/lib/derby.browser.js
@@ -126,10 +126,12 @@ function init(modelBundle, ctx) {
 
     // Reinitialize any collections which were already initialized
     // during rendering on the server
-    var Collections = ctx.$collections.map(function(name) {
-      return app._Collections[name];
-    });
-    page.init.apply(page, Collections);
+    if (ctx.$collections) {
+      var Collections = ctx.$collections.map(function(name) {
+        return app._Collections[name];
+      });
+      page.init.apply(page, Collections);
+    }
 
     // Update events should wait until after first render is done
     dom._preventUpdates = true;

diff --git a/lib/refresh.server.js b/lib/refresh.server.js
@@ -53,7 +53,7 @@ function setupStore(store, views, isProduction) {
         }
       }
       callback(reload);
-      if (isProduction || reload) return;
+      if (isProduction || reload || !process.send) return;
 
       appFilename = view._appFilename;
       if (listeners[appFilename]) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "derby",
   "description": "MVC framework making it easy to write realtime, collaborative applications that run in both Node.js and browsers.",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "homepage": "http://derbyjs.com/",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "dom-shim": ">=0.1.0",
     "html-util": ">=0.1.3",
     "tracks": ">=0.1.10",
-    "racer": "0.3.14",
+    "racer": "0.3.15",
     "chokidar": ">=0.2.6",
     "stylus": ">=0.25.0",
     "less": ">=1.3.0",