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

Merge "ui: check for non nil results before using them"

This commit is contained in:
Brad Fitzpatrick 2014-01-28 00:38:38 +00:00 committed by Gerrit Code Review
parent a70b554023 d4b4194ed0
commit 52a68b9c30
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/camlistored/ui/blob_item_container_react.js
View File

@ -136,6 +136,9 @@ cam.BlobItemContainerReact = React.createClass({
this.childProps_ = [];
var results = this.props.searchSession.getCurrentResults();
if (!results || !results.blobs || results.blobs.length == 0) {
return;
}
var data = goog.array.map(results.blobs, function(blob) {
return new cam.BlobItemReactData(blob.blob, results.description.meta);
});

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

@ -178,7 +178,11 @@ cam.SearchSession.prototype.startSocketQuery_ = function() {
this.socket_.close();
}
var query = this.connection_.buildQuery(this.query_, this.constructor.DESCRIBE_REQUEST, Math.max(this.data_.blobs.length, this.constructor.PAGE_SIZE_));
var numResults = 0;
if (this.data_ && this.data_.blobs) {
numResults = this.data_.blobs.length;
}
var query = this.connection_.buildQuery(this.query_, this.constructor.DESCRIBE_REQUEST, Math.max(numResults, this.constructor.PAGE_SIZE_));
this.socket_ = new WebSocket(this.socketUri_.toString());
this.socket_.onopen = function() {