public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflict

pull/344/merge
Peter 'Pita' Martischka 2012-01-22 15:23:50 +01:00
parent e2a348057d 7dcc7be8e0
commit d391dab558
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
node/server.js
View File

@ -45,8 +45,9 @@ var socketIORouter;
var version = ""; var version = "";
try try
{ {
var ref = fs.readFileSync("../.git/HEAD", "utf-8"); var rootPath = path.normalize(__dirname + "/../")
var refPath = "../.git/" + ref.substring(5, ref.indexOf("\n")); var ref = fs.readFileSync(rootPath + ".git/HEAD", "utf-8");
var refPath = rootPath + ".git/" + ref.substring(5, ref.indexOf("\n"));
version = fs.readFileSync(refPath, "utf-8"); version = fs.readFileSync(refPath, "utf-8");
version = version.substring(0, 7); version = version.substring(0, 7);
console.log("Your Etherpad Lite git version is " + version); console.log("Your Etherpad Lite git version is " + version);

18
node/utils/Minify.js
View File

@ -52,6 +52,8 @@ exports.minifyJS = function(req, res, jsFilename)
throw new Error("there is no profile for creating " + name); throw new Error("there is no profile for creating " + name);
} }
var rootPath = path.normalize(__dirname + "/../../" );
//minifying is enabled //minifying is enabled
if(settings.minify) if(settings.minify)
{ {
@ -63,7 +65,7 @@ exports.minifyJS = function(req, res, jsFilename)
//find out the highest modification date //find out the highest modification date
function(callback) function(callback)
{ {
var folders2check = ["../static/css","../static/js"]; var folders2check = [rootPath + "static/css", rootPath + "static/js"];
//go trough this two folders //go trough this two folders
async.forEach(folders2check, function(path, callback) async.forEach(folders2check, function(path, callback)
@ -102,7 +104,7 @@ exports.minifyJS = function(req, res, jsFilename)
function(callback) function(callback)
{ {
//check the modification time of the minified js //check the modification time of the minified js
fs.stat("../var/minified_" + jsFilename, function(err, stats) fs.stat(rootPath + "var/minified_" + jsFilename, function(err, stats)
{ {
if(err && err.code != "ENOENT") if(err && err.code != "ENOENT")
{ {
@ -127,7 +129,7 @@ exports.minifyJS = function(req, res, jsFilename)
{ {
async.forEach(jsFiles, function (item, callback) async.forEach(jsFiles, function (item, callback)
{ {
fs.readFile("../static/js/" + item, "utf-8", function(err, data) fs.readFile(rootPath + "static/js/" + item, "utf-8", function(err, data)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
fileValues[item] = data; fileValues[item] = data;
@ -205,7 +207,7 @@ exports.minifyJS = function(req, res, jsFilename)
//write the results plain in a file //write the results plain in a file
function(callback) function(callback)
{ {
fs.writeFile("../var/minified_" + jsFilename, result, "utf8", callback); fs.writeFile(rootPath + "var/minified_" + jsFilename, result, "utf8", callback);
}, },
//write the results compressed in a file //write the results compressed in a file
function(callback) function(callback)
@ -219,7 +221,7 @@ exports.minifyJS = function(req, res, jsFilename)
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
fs.writeFile("../var/minified_" + jsFilename + ".gz", compressedResult, callback); fs.writeFile(rootPath + "var/minified_" + jsFilename + ".gz", compressedResult, callback);
}); });
} }
//skip this step on windows //skip this step on windows
@ -243,12 +245,12 @@ exports.minifyJS = function(req, res, jsFilename)
var pathStr; var pathStr;
if(gzipSupport && os.type().indexOf("Windows") == -1) if(gzipSupport && os.type().indexOf("Windows") == -1)
{ {
pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename + ".gz"); pathStr = path.normalize(rootPath + "var/minified_" + jsFilename + ".gz");
res.header('Content-Encoding', 'gzip'); res.header('Content-Encoding', 'gzip');
} }
else else
{ {
pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename ); pathStr = path.normalize(rootPath + "var/minified_" + jsFilename );
} }
res.sendfile(pathStr, { maxAge: server.maxAge }); res.sendfile(pathStr, { maxAge: server.maxAge });
@ -262,7 +264,7 @@ exports.minifyJS = function(req, res, jsFilename)
//read all js files //read all js files
async.forEach(jsFiles, function (item, callback) async.forEach(jsFiles, function (item, callback)
{ {
fs.readFile("../static/js/" + item, "utf-8", function(err, data) fs.readFile(rootPath + "static/js/" + item, "utf-8", function(err, data)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
fileValues[item] = data; fileValues[item] = data;

4
node/utils/Settings.js
View File

@ -21,6 +21,7 @@
var fs = require("fs"); var fs = require("fs");
var os = require("os"); var os = require("os");
var path = require('path');
/** /**
* The IP ep-lite should listen to * The IP ep-lite should listen to
@ -88,7 +89,8 @@ exports.abiwordAvailable = function()
} }
//read the settings sync //read the settings sync
var settingsStr = fs.readFileSync("../settings.json").toString(); var settingsPath = path.normalize(__dirname + "/../../");
var settingsStr = fs.readFileSync(settingsPath + "settings.json").toString();
//remove all comments //remove all comments
settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,""); settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");