Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #8 from pritambaral/master

NowJS and express compatibility. Fixed serving of nowjs files.
  • Loading branch information...
commit c7a9a38cbac8cb7bc0bde19e78e7c78b78273b5f 2 parents f64c333 + 1e5a218
@chaoscollective authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 app.js
View
4 app.js
@@ -56,7 +56,7 @@ app.get('/',function(req,res,next){
staticProvider(req, res, next);
});
var port = process.env.PORT || 3149;
-app.listen(port);
+var server = app.listen(port);
var EDITABLE_APPS_DIR = "/APPS/";
var ENABLE_LAUNCH = false;
@@ -418,7 +418,7 @@ app.get("/allUsersEditingProjects", function(req, res){
// ------------------------------------------------------------
var localFileIsMostRecent = []; // an array of flags indicating if the file has been modified since last save.
var nowjs = require("now");
-var everyone = nowjs.initialize(app);
+var everyone = nowjs.initialize(server);
// ------ REALTIME NOWJS COLLABORATION ------
//var nowcollab = require("../CHAOS/nowcollab");
//nowcollab.initialize(nowjs, everyone, true);
Please sign in to comment.
Something went wrong with that request. Please try again.