mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-14 18:24:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-04-07 20:04:52 +01:00
commit 89adffed74
5 changed files with 1634 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

4
node/MessageHandler.js
View file

@ -436,7 +436,7 @@ function handleClientReady(client, message)
},
"collab_client_vars": {
"initialAttributedText": atext,
"clientIp": client.request.connection.remoteAddress,
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
//"clientAgent": "Anonymous Agent",
"padId": message.padId,
"historicalAuthorData": {},
@ -445,7 +445,7 @@ function handleClientReady(client, message)
"globalPadId": message.padId
},
"colorPalette": ["#ffc7c7", "#fff1c7", "#e3ffc7", "#c7ffd5", "#c7ffff", "#c7d5ff", "#e3c7ff", "#ffc7f1", "#ff8f8f", "#ffe38f", "#c7ff8f", "#8fffab", "#8fffff", "#8fabff", "#c78fff", "#ff8fe3", "#d97979", "#d9c179", "#a9d979", "#79d991", "#79d9d9", "#7991d9", "#a979d9", "#d979c1", "#d9a9a9", "#d9cda9", "#c1d9a9", "#a9d9b5", "#a9d9d9", "#a9b5d9", "#c1a9d9", "#d9a9cd"],
"clientIp": client.request.connection.remoteAddress,
"clientIp": (client.request && client.request.connection) ? client.request.connection.remoteAddress : "127.0.0.1",
"userIsGuest": true,
"userColor": authorManager.getAuthorColorId(author),
"padId": message.padId,