aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-02-01 18:50:40 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2011-02-01 18:56:37 +0100
commitdf1d16fb254bc93da2eb762fb65566f1db1bff33 (patch)
tree446a49857110cbf043003af43c507661d8d46a3c
parent77de9c01ddc70ce64e45d7742018860394888988 (diff)
downloadetherpad-df1d16fb254bc93da2eb762fb65566f1db1bff33.tar.gz
etherpad-df1d16fb254bc93da2eb762fb65566f1db1bff33.tar.xz
etherpad-df1d16fb254bc93da2eb762fb65566f1db1bff33.zip
removed ip/user-agent from tooltipsHEADmaster
-rw-r--r--etherpad/src/static/js/pad2.js2
-rw-r--r--etherpad/src/static/js/pad_userlist.js2
2 files changed, 0 insertions, 4 deletions
diff --git a/etherpad/src/static/js/pad2.js b/etherpad/src/static/js/pad2.js
index 14ac762..860e756 100644
--- a/etherpad/src/static/js/pad2.js
+++ b/etherpad/src/static/js/pad2.js
@@ -89,9 +89,7 @@ var pad = {
pad.myUserInfo = {
userId: clientVars.userId,
name: clientVars.userName,
- ip: pad.getClientIp(),
colorId: clientVars.userColor,
- userAgent: pad.getDisplayUserAgent()
};
if (clientVars.specialKey) {
pad.myUserInfo.specialKey = clientVars.specialKey;
diff --git a/etherpad/src/static/js/pad_userlist.js b/etherpad/src/static/js/pad_userlist.js
index 13bfd6a..51a8fed 100644
--- a/etherpad/src/static/js/pad_userlist.js
+++ b/etherpad/src/static/js/pad_userlist.js
@@ -469,8 +469,6 @@ var paduserlist = (function() {
userData.status = '';
userData.activity = '';
userData.id = info.userId;
- // Firefox ignores \n in title text; Safari does a linebreak
- userData.titleText = [info.userAgent||'', info.ip||''].join(' \n');
var existingIndex = findExistingIndex(info.userId);