Misc fixes and cleanup.

cliftonc · Dec 23, 2012 · 7fa8be4 · 7fa8be4
1 parent 872609e
commit 7fa8be4
Show file tree

Hide file tree

Showing 7 changed files with 4,320 additions and 154 deletions.
diff --git a/.idea/calipso.iml b/.idea/calipso.iml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/libraries/Calipso_node_modules.xml b/.idea/libraries/Calipso_node_modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app.js b/app.js
@@ -8,7 +8,8 @@
  *
  */
 
-var req = require('express/lib/request');
+var req = require('express/lib/request'),
+    utils = require('express/lib/utils');
 
  var flashFormatters = req.flashFormatters = {
    s: function(val){
@@ -98,7 +99,7 @@ var rootpath = process.cwd() + '/',
   calipso = require(nodepath.join(rootpath, 'lib/calipso')),
   translate = require(nodepath.join(rootpath, 'i18n/translate')),
   logo = require(nodepath.join(rootpath, 'logo')),
-  everyauth = require("everyauth");
+  everyauth = require('everyauth');
 
 // To enable everyauth debugging.
 //everyauth.debug = true;

diff --git a/jasmine-1.1.0.js b/jasmine-1.1.0.js
@@ -115,8 +115,7 @@ jasmine.ExpectationResult.prototype.passed = function () {
  * Getter for the Jasmine environment. Ensures one gets created
  */
 jasmine.getEnv = function() {
-  var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
-  return env;
+  return jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
 };
 
 /**

diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
     "request":"2.9.x",
     "pool":"0.4.x",
     "mime":"1.2.x",
-    "cluster": "0.7.x",
     "step": "0.0.x",
     "optimist":"0.3.x",
     "colors":"0.6.x",