diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2013-01-27 16:45:09 +0000 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2013-01-27 16:45:09 +0000 |
| commit | 07a267be7a372df4e2d7a899d4af5ba7b30057b8 (patch) | |
| tree | 38611f7b472893b5ad443941c6d56fe21a6dcb16 /src/node/db/Pad.js | |
| parent | dcfb1b2ea4bd3ee8783c6a01aeebc8c760aa7a06 (diff) | |
| download | etherpad-lite-07a267be7a372df4e2d7a899d4af5ba7b30057b8.zip | |
Added colors to pad diff
Diffstat (limited to 'src/node/db/Pad.js')
| -rw-r--r-- | src/node/db/Pad.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index 037886ea..4701e82a 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -227,7 +227,8 @@ Pad.prototype.getAllAuthorColors = function getAllAuthorColors(callback){ if(err){ return callback(err); } - returnTable[author]=colorPalette[colorId]; + //colorId might be a hex color or an number out of the palette + returnTable[author]=colorPalette[colorId] || colorId; callback(); }); |