Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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();

9
src/components/structures/RoomStatusBar.js
View File

@ -82,7 +82,7 @@ module.exports = React.createClass({
getDefaultProps: function() {
return {
whoIsTypingLimit: 2,
whoIsTypingLimit: 3,
};
},
@ -217,8 +217,11 @@ module.exports = React.createClass({
_renderTypingIndicatorAvatars: function(limit) {
let users = this.state.usersTyping;
let othersCount = Math.max(users.length - limit, 0);
users = users.slice(0, limit);
let othersCount = 0;
if (users.length > limit) {
othersCount = users.length - limit + 1;
users = users.slice(0, limit - 1);
}
let avatars = users.map((u, index) => {
let showInitial = othersCount === 0 && index === users.length - 1;

2
src/components/structures/RoomView.js
View File

@ -1537,7 +1537,7 @@ module.exports = React.createClass({
onResize={this.onChildResize}
onVisible={this.onStatusBarVisible}
onHidden={this.onStatusBarHidden}
whoIsTypingLimit={2}
whoIsTypingLimit={3}
/>;
}