Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 October 27, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  app.js
4  app.js
@@ -56,7 +56,7 @@ app.get('/',function(req,res,next){
56 56
   staticProvider(req, res, next);
57 57
 });
58 58
 var port = process.env.PORT || 3149;
59  
-app.listen(port); 
  59
+var server = app.listen(port); 
60 60
  
61 61
 var EDITABLE_APPS_DIR = "/APPS/"; 
62 62
 var ENABLE_LAUNCH     = false;
@@ -418,7 +418,7 @@ app.get("/allUsersEditingProjects", function(req, res){
418 418
 // ------------------------------------------------------------
419 419
 var localFileIsMostRecent = []; // an array of flags indicating if the file has been modified since last save.
420 420
 var nowjs     = require("now");
421  
-var everyone  = nowjs.initialize(app);
  421
+var everyone  = nowjs.initialize(server);
422 422
 // ------ REALTIME NOWJS COLLABORATION ------
423 423
 //var nowcollab = require("../CHAOS/nowcollab");
424 424
 //nowcollab.initialize(nowjs, everyone, true);

0 notes on commit c7a9a38

Please sign in to comment.
Something went wrong with that request. Please try again.