Merge pull request #2422 from vector-im/dbkr/fix_no_freenode_rooms

Don't stop paginating if no rooms match

src/components/structures/RoomDirectory.js

@@ -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">
+                { scrollpanel_content }
-                        <tbody>
-                            { this.getRows() }
-                        </tbody>
-                    </table>
             </ScrollPanel>;
         }
-        }
 
         let placeholder = 'Search for a room';
         if (this.state.network === null || this.state.network === '_matrix') {