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

Fix missing callback of #2400 and ignore missing author on timeslider on client-side

Browse source
This commit is contained in:
Gared 2014-12-27 22:25:24 +01:00
parent a645aeef5c
commit 9cf19b99fe
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/static/js/broadcast_slider.js
View file

@ -177,23 +177,26 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
var colorsAnonymous = [];
_.each(authors, function(author)
{
var authorColor = clientVars.colorPalette[author.colorId] || author.colorId;
if (author.name)
if(author)
{
if (numNamed !== 0) authorsList.append(', ');
$('<span />')
.text(author.name || "unnamed")
.css('background-color', authorColor)
.addClass('author')
.appendTo(authorsList);
var authorColor = clientVars.colorPalette[author.colorId] || author.colorId;
if (author.name)
{
if (numNamed !== 0) authorsList.append(', ');
$('<span />')
.text(author.name || "unnamed")
.css('background-color', authorColor)
.addClass('author')
.appendTo(authorsList);
numNamed++;
}
else
{
numAnonymous++;
if(authorColor) colorsAnonymous.push(authorColor);
numNamed++;
}
else
{
numAnonymous++;
if(authorColor) colorsAnonymous.push(authorColor);
}
}
});
if (numAnonymous > 0)