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

src/node/handler/PadMessageHandler.js

@@ -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();
             });

src/static/js/broadcast_slider.js

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