gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't stop paginating if no rooms match 

Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).

Fixes no freenode rooms being shown.
This commit is contained in:
David Baker 2016-10-05 18:06:43 +01:00
parent cd7adfed0a
commit 5e293c0f45
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/structures/RoomDirectory.js
View File

@ -554,9 +554,19 @@ module.exports = React.createClass({
</div>;
} else {
const rows = this.getRows();
// we still show the scrollpanel, at least for now, because
// otherwise we don't fetch more because we don't get a fill
// request from the scrollpanel because there isn't one
let scrollpanel_content;
if (rows.length == 0) {
content = <i>No rooms to show</i>;
scrollpanel_content = <i>No rooms to show</i>;
} else {
scrollpanel_content = <table ref="directory_table" className="mx_RoomDirectory_table">
<tbody>
{ this.getRows() }
</tbody>
</table>;
}
const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
content = <ScrollPanel ref={this.collectScrollPanel}
className="mx_RoomDirectory_tableWrapper"
@ -565,14 +575,9 @@ module.exports = React.createClass({
startAtBottom={false}
onResize={function(){}}
>
<table ref="directory_table" className="mx_RoomDirectory_table">
<tbody>
{ this.getRows() }
</tbody>
</table>
{ scrollpanel_content }
</ScrollPanel>;
}
}
let placeholder = 'Search for a room';
if (this.state.network === null || this.state.network === '_matrix') {