merge

maccman · Oct 31, 2011 · 453b65d · 453b65d
2 parents a0eac33 + 909efba
commit 453b65d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/client.js b/client.js
@@ -3339,5 +3339,9 @@ Juggernaut.Message.prototype.toJSON = function(){
   return(JSON.stringify(object));
 };
 
-if (typeof module != "undefined")
+if (typeof module != "undefined") {
   module.exports = Juggernaut;
+} else {
+  window.Juggernaut = Juggernaut;
+}
+;
diff --git a/client/vendor/assets/javascripts/juggernaut.js b/client/vendor/assets/javascripts/juggernaut.js
@@ -135,5 +135,8 @@ Juggernaut.Message.prototype.toJSON = function(){
   return(JSON.stringify(object));
 };
 
-if (typeof module != "undefined")
-  module.exports = Juggernaut;
+if (typeof module != "undefined") {
+  module.exports = Juggernaut;
+} else {
+  window.Juggernaut = Juggernaut;
+}
diff --git a/lib/juggernaut/server.js b/lib/juggernaut/server.js
@@ -8,9 +8,10 @@ var nstatic  = require("node-static-maccman");
 var Connection = require("./connection");
 
 var credentials;
-if (path.existsSync("keys/privatekey.pem")) {
-  var privateKey  = fs.readFileSync("keys/privatekey.pem", "utf8");
-  var certificate = fs.readFileSync("keys/certificate.pem", "utf8");
+var keysPath = __dirname + "/keys";
+if (path.existsSync(keysPath + "/privatekey.pem") && path.existsSync(keysPath + "/certificate.pem")) {
+  var privateKey = fs.readFileSync(keysPath + "/privatekey.pem", "utf8");
+  var certificate = fs.readFileSync(keysPath + "/certificate.pem", "utf8");
   credentials = {key: privateKey, cert: certificate};
 }
 

diff --git a/public/application.js b/public/application.js