summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2014-04-30 22:32:08 +0200
committerMarcel Klehr <mklehr@gmx.net>2014-04-30 22:32:08 +0200
commit46ef83d7106c1a94c9db161203f4df7b2773cbf4 (patch)
treebb28d75fdfa829fd5a65ac108f4c6486f2aff69d /src
parent706ee1f86628af5f35332222f1d3cbce98ba6cfc (diff)
downloadetherpad-lite-46ef83d7106c1a94c9db161203f4df7b2773cbf4.zip
Fix #online_count
Rather dirty, but works.
Diffstat (limited to 'src')
-rw-r--r--src/static/js/pad_userlist.js18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index 9228408f..ebb057c8 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -1,5 +1,5 @@
/**
- * This code is mostly from the old Etherpad. Please help us to comment this code.
+ * This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@@ -513,7 +513,7 @@ var paduserlist = (function()
{
info.colorId = clientVars.colorPalette[info.colorId];
}
-
+
myUserInfo = $.extend(
{}, info);
@@ -602,7 +602,13 @@ var paduserlist = (function()
online++;
}
}
- $("#online_count").text(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);
return online;
},
@@ -724,9 +730,9 @@ var paduserlist = (function()
{
$("#myswatchbox").addClass('myswatchboxhoverable').removeClass('myswatchboxunhoverable');
}
-
+
$("#myswatch").css({'background-color': myUserInfo.colorId});
-
+
if ($.browser.msie && parseInt($.browser.version) <= 8) {
$("li[data-key=showusers] > a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
}
@@ -748,7 +754,7 @@ function getColorPickerSwatchIndex(jnode)
function closeColorPicker(accept)
{
if (accept)
- {
+ {
var newColor = $("#mycolorpickerpreview").css("background-color");
var parts = newColor.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
// parts now should be ["rgb(0, 70, 255", "0", "70", "255"]