libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2138 from ether/fix-user-icon-color-and-count

Browse source 
Fix showusers button: Show authorcolor and user_count again
This commit is contained in:
Marcel Klehr 2014-05-03 13:32:22 +02:00
commit e85d09400e
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/static/js/pad_userlist.js
View file

@ -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;
},
@ -728,11 +734,11 @@ var paduserlist = (function()
$("#myswatch").css({'background-color': myUserInfo.colorId});
if ($.browser.msie && parseInt($.browser.version) <= 8) {
$("#usericon a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
$("li[data-key=showusers] > a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
}
else
{
$("#usericon a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId});
$("li[data-key=showusers] > a").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId});
}
}
};