fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2257 from 0ip/fix/user-count 

Fix broken user count
This commit is contained in:
John McLear 2014-10-05 12:42:52 +01:00
parent f3f653f07f 5008ad10c6
commit fb940897ee
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/static/css/pad.css
View File

@ -170,9 +170,10 @@ li[data-key=showusers] > a {
}
li[data-key=showusers] > a #online_count {
color: #777;
font-size: 10px;
font-size: 11px;
position: relative;
top: 2px;
padding-left: 2px;
}
#editorcontainer {
position: absolute;
@ -740,9 +741,6 @@ table#otheruserstable {
opacity: 0.01;
display: none;
}
#online_count {
color: #888;
}
.rtl {
direction: RTL
}

11
src/static/js/pad_userlist.js
View File

@ -468,6 +468,8 @@ var paduserlist = (function()
self.setMyUserInfo(myInitialUserInfo);
$('#editbar [data-key=showusers] > a').append('<span id="online_count">1</span>');
$("#otheruserstable tr").remove();
if (pad.getUserIsGuest())
@ -602,13 +604,8 @@ var paduserlist = (function()
online++;
}
}
var $btn = $("#editbar [data-key=showusers] > a")
, $counter = $('#online_count', $btn)
if(!$counter.length) {
$counter = $('<span id="online_count">')
$btn.append($counter)
}
$counter.text(online);
$('#online_count').text(online);
return online;
},