Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug where 'no results' message sometimes showed momentarily. 

SearchSession::isComplete() could sometimes return the wrong answer.
Nulling out the continuation is needed to make loadMoreResults()
idempotent. So had to add more state to SearchSession specifically
for tracking completeness.

Change-Id: Ic2a90c73f3a764f358476cffa6d498ea53103421
This commit is contained in:
Aaron Boodman 2014-11-07 23:44:39 -08:00
parent 0ba58ae829
commit d9316ff8dd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/camlistored/ui/search_session.js
View File

@ -42,6 +42,7 @@ cam.SearchSession = function(connection, currentUri, query) {
this.continuation_ = this.getContinuation_(this.constructor.SEARCH_SESSION_CHANGE_TYPE.NEW);
this.socket_ = null;
this.supportsWebSocket_ = false;
this.isComplete_ = false;
this.resetData_();
};
@ -97,7 +98,7 @@ cam.SearchSession.prototype.loadMoreResults = function() {
// Returns true if it is known that all data which can be loaded for this query has been.
cam.SearchSession.prototype.isComplete = function() {
return !this.continuation_;
return this.isComplete_;
}
cam.SearchSession.prototype.supportsChangeNotifications = function() {
@ -207,6 +208,7 @@ cam.SearchSession.prototype.searchDone_ = function(changeType, result) {
this.continuation_ = this.getContinuation_(this.constructor.SEARCH_SESSION_CHANGE_TYPE.APPEND, result.continue);
} else {
this.continuation_ = null;
this.isComplete_ = true;
}
if (changes) {