PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

MELS: either expanded or summary, not both

Browse source 
Fixes vector-im/riot-web#3097
This commit is contained in:
Luke Barnard 2017-02-09 15:14:16 +00:00
parent 7ba9e27893
commit 8d3876c7d0
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/components/views/elements/MemberEventListSummary.js
View file

@ -108,7 +108,7 @@ module.exports = React.createClass({
}
return (
<span>
<span className="mx_TextualEvent mx_MemberEventListSummary_summary">
{summaries.join(", ")}
</span>
);
@ -264,7 +264,7 @@ module.exports = React.createClass({
);
});
return (
<span>
<span className="mx_MemberEventListSummary_avatars">
{avatars}
</span>
);
@ -397,31 +397,28 @@ module.exports = React.createClass({
(seq1, seq2) => aggregate.indices[seq1] > aggregate.indices[seq2]
);
const avatars = this._renderAvatars(avatarMembers);
const summary = this._renderSummary(aggregate.names, orderedTransitionSequences);
const toggleButton = (
<a className="mx_MemberEventListSummary_toggle" onClick={this._toggleSummary}>
{expanded ? 'collapse' : 'expand'}
</a>
);
const summaryContainer = (
<div className="mx_EventTile_line">
<div className="mx_EventTile_info">
<span className="mx_MemberEventListSummary_avatars">
{avatars}
</span>
<span className="mx_TextualEvent mx_MemberEventListSummary_summary">
{summary}
</span>&nbsp;
{toggleButton}
let summaryContainer = null;
if (!expanded) {
summaryContainer = (
<div className="mx_EventTile_line">
<div className="mx_EventTile_info">
{this._renderAvatars(avatarMembers)}
{this._renderSummary(aggregate.names, orderedTransitionSequences)}
</div>
</div>
);
}
const toggleButton = (
<div className={"mx_MemberEventListSummary_toggle"} onClick={this._toggleSummary}>
{expanded ? 'collapse' : 'expand'}
</div>
);
return (
<div className="mx_MemberEventListSummary">
{toggleButton}
{summaryContainer}
{expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null}
{expandedEvents}
</div>
);