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

improve the fix for https://github.com/vector-im/vector-web/issues/917

Browse source
This commit is contained in:
Matthew Hodgson 2016-02-15 09:52:57 +02:00
parent 9d3b0f6075
commit 0a37f1c478
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/SearchableEntityList.js
View file

@ -140,6 +140,7 @@ var SearchableEntityList = React.createClass({
} }
var list; var list;
if (this.state.results.length) {
if (this.props.truncateAt) { // caller wants list truncated if (this.props.truncateAt) { // caller wants list truncated
var TruncatedList = sdk.getComponent("elements.TruncatedList"); var TruncatedList = sdk.getComponent("elements.TruncatedList");
list = ( list = (
@ -161,13 +162,15 @@ var SearchableEntityList = React.createClass({
</div> </div>
); );
} }
list = <GeminiScrollbar autoshow={true} className="mx_SearchableEntityList_listWrapper">
{ list }
</GeminiScrollbar>;
}
return ( return (
<div className={ "mx_SearchableEntityList " + (this.state.query.length ? "mx_SearchableEntityList_expanded" : "") }> <div className={ "mx_SearchableEntityList " + (this.state.query.length ? "mx_SearchableEntityList_expanded" : "") }>
{inputBox} { inputBox }
<GeminiScrollbar autoshow={true} className="mx_SearchableEntityList_listWrapper">
{ list } { list }
</GeminiScrollbar>
{ this.state.query.length ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' } { this.state.query.length ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' }
</div> </div>
); );