From 4730179c26c18592ab38457e108047094234a787 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 5 Jan 2016 15:51:16 +0000 Subject: [PATCH] Fix slight mis-merge We need to return 'true' from our promise of search result pagination. Also inline _backPaginateSearch which mostly served to confuse, and use debuglog instead of checking DEBUG_SCROLL --- src/components/structures/RoomView.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index abefbdd9bc..ad30f25b22 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -366,7 +366,9 @@ module.exports = React.createClass({ if (this.state.searchResults.next_batch) { debuglog("requesting more search results"); - return this._backPaginateSearch(); + var searchPromise = MatrixClientPeg.get().backPaginateRoomEventsSearch( + this.state.searchResults); + return this._handleSearchResult(searchPromise); } else { debuglog("no more search results"); return q(false); @@ -511,7 +513,7 @@ module.exports = React.createClass({ }; } - if (DEBUG_SCROLL) console.log("sending search request"); + debuglog("sending search request"); var searchPromise = MatrixClientPeg.get().searchRoomEvents({ filter: filter, @@ -520,14 +522,6 @@ module.exports = React.createClass({ this._handleSearchResult(searchPromise).done(); }, - _backPaginateSearch: function() { - if (DEBUG_SCROLL) console.log("sending search back-paginate request"); - - var searchPromise = MatrixClientPeg.get().backPaginateRoomEventsSearch( - this.state.searchResults); - return this._handleSearchResult(searchPromise); - }, - _handleSearchResult: function(searchPromise) { var self = this;