imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not show "+1 other"

Browse source 
Instead show a user name or avatar.
This commit is contained in:
Luke Barnard 2017-02-09 10:30:06 +00:00
parent 553054409f
commit 103710728f
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/WhoIsTyping.js
View file

@ -49,8 +49,10 @@ module.exports = {
},
whoIsTypingString: function(whoIsTyping, limit) {
const othersCount = limit === undefined ?
0 : Math.max(whoIsTyping.length - limit, 0);
let othersCount = 0;
if (whoIsTyping.length > limit) {
othersCount = whoIsTyping.length - limit + 1;
}
if (whoIsTyping.length == 0) {
return '';
} else if (whoIsTyping.length == 1) {
@ -61,7 +63,7 @@ module.exports = {
});
if (othersCount) {
const other = ' other' + (othersCount > 1 ? 's' : '');
return names.slice(0, limit).join(', ') + ' and ' +
return names.slice(0, limit - 1).join(', ') + ' and ' +
othersCount + other + ' are typing';
} else {
const lastPerson = names.pop();