OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed logs, updated phrasing on 'others joined' 

Now it's:
 1 user joined and left
 >1 others joined and left
pull/21833/head
Luke Barnard 2016-11-10 10:42:33 +00:00
parent 5f0b891d47
commit f5bc8d1fe0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/elements/MemberEventListSummary.js
View File

@ -185,8 +185,6 @@ module.exports = React.createClass({
}); });
let fewEvents = eventsToRender.length < this.props.threshold; let fewEvents = eventsToRender.length < this.props.threshold;
console.log(eventsToRender.length, joinEvents.length, leaveEvents.length, this.state.expanded, fewEvents);
let expanded = this.state.expanded || fewEvents; let expanded = this.state.expanded || fewEvents;
let expandedEvents = null; let expandedEvents = null;
@ -204,6 +202,8 @@ module.exports = React.createClass({
<a onClick={this.toggleSummary} href="javascript:;">{expanded?'collapse':'expand'}</a> <a onClick={this.toggleSummary} href="javascript:;">{expanded?'collapse':'expand'}</a>
); );
let noun = (joinAndLeft === 1 ? 'user' : 'others');
summaryContainer = ( summaryContainer = (
<div className="mx_EventTile_line"> <div className="mx_EventTile_line">
<div className="mx_EventTile_info"> <div className="mx_EventTile_info">
@ -211,7 +211,7 @@ module.exports = React.createClass({
{avatars} {avatars}
</span> </span>
<span className="mx_TextualEvent mx_MemberEventListSummary_summary"> <span className="mx_TextualEvent mx_MemberEventListSummary_summary">
{summary}{joinAndLeft? '. ' + joinAndLeft + ' others joined and left' : ''} {summary}{joinAndLeft? '. ' + joinAndLeft + ' ' + noun + ' joined and left' : ''}
</span>&nbsp; </span>&nbsp;
{toggleButton} {toggleButton}
</div> </div>