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

Merge pull request #2406 from Gared/fix/author-not-set-callback

Browse source 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
This commit is contained in:
Stefan 2014-12-30 14:55:49 +01:00
commit c20a7e9bce
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

@ -180,23 +180,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)