public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix missing callback of #2400 and ignore missing author on timeslider on client-side
pull/2420/head
Stefan 2014-12-30 14:55:49 +01:00
parent 5df638bfac 9cf19b99fe
commit c20a7e9bce
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/handler/PadMessageHandler.js
View File

@ -1070,7 +1070,12 @@ function handleClientReady(client, message)
{
authorManager.getAuthor(authorId, function(err, author)
{
if(ERR(err, callback) || !author) return;
if(!author && !err)
{
messageLogger.error("There is no author for authorId:", authorId);
return callback();
}
if(ERR(err, callback)) return;
historicalAuthorData[authorId] = {name: author.name, colorId: author.colorId}; // Filter author attribs (e.g. don't send author's pads to all clients)
callback();
});

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)