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

Combine data-scroll-token and -contained-scroll-tokens

Browse source 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
This commit is contained in:
Luke Barnard 2017-05-04 10:00:13 +01:00
parent 4febc63aee
commit bfa3123f9b
5 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -369,7 +369,7 @@ module.exports = React.createClass({
render: function() {
const eventsToRender = this.props.events;
const eventIds = eventsToRender.map(e => e.getId());
const eventIds = eventsToRender.map(e => e.getId()).join(',');
const fewEvents = eventsToRender.length < this.props.threshold;
const expanded = this.state.expanded || fewEvents;
@ -380,7 +380,7 @@ module.exports = React.createClass({
if (fewEvents) {
return (
<div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
<div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
{expandedEvents}
</div>
);
@ -438,7 +438,7 @@ module.exports = React.createClass({
);
return (
<div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
<div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
{toggleButton}
{summaryContainer}
{expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null}