mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-04 22:27:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

my changes in pad2.js

Browse source
This commit is contained in:
Wikinaut 2011-11-16 23:22:55 +01:00
commit 913c006152
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
node/server.js
View file

@ -91,7 +91,10 @@ async.waterfall([
var httpLogger = log4js.getLogger("http"); var httpLogger = log4js.getLogger("http");
app.configure(function() app.configure(function()
{ {
app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
// Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
app.use(express.cookieParser()); app.use(express.cookieParser());
}); });

16
static/js/pad2.js
View file

@ -79,13 +79,13 @@ function randomString()
function getParams() function getParams()
{ {
var params = getUrlVars() var params = getUrlVars()
var showControls = params["showControls"]; var showControls = params["showControls"];
var showChat = params["showChat"]; var showChat = params["showChat"];
var userName = params["userName"]; var userName = params["userName"];
var showLineNumbers = params["showLineNumbers"]; var showLineNumbers = params["showLineNumbers"];
var useMonospaceFont = params["useMonospaceFont"]; var useMonospaceFont = params["useMonospaceFont"];
var IsnoColors = params["noColors"]; var IsnoColors = params["noColors"];
if(IsnoColors) if(IsnoColors)
{ {
@ -131,7 +131,7 @@ var IsnoColors = params["noColors"];
if(userName) if(userName)
{ {
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad. // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
globalUserName = unescape( userName ); globalUserName = unescape(userName);
} }
} }