fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1020,7 +1020,12 @@ function handleClientReady(client, message)
{ {
authorManager.getAuthor(authorId, function(err, author) 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) historicalAuthorData[authorId] = {name: author.name, colorId: author.colorId}; // Filter author attribs (e.g. don't send author's pads to all clients)
callback(); callback();
}); });

3
src/static/js/broadcast_slider.js
View File

@ -176,6 +176,8 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
var numNamed = 0; var numNamed = 0;
var colorsAnonymous = []; var colorsAnonymous = [];
_.each(authors, function(author) _.each(authors, function(author)
{
if(author)
{ {
var authorColor = clientVars.colorPalette[author.colorId] || author.colorId; var authorColor = clientVars.colorPalette[author.colorId] || author.colorId;
if (author.name) if (author.name)
@ -195,6 +197,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
numAnonymous++; numAnonymous++;
if(authorColor) colorsAnonymous.push(authorColor); if(authorColor) colorsAnonymous.push(authorColor);
} }
}
}); });
if (numAnonymous > 0) if (numAnonymous > 0)
{ {