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

Merge "server/perkeepd/ui: perm aspect takes precedence over map aspect"

This commit is contained in:
Mathieu Lonjaret 2018-04-28 06:22:13 +00:00 committed by Gerrit Code Review
parent f8bc4ac6e5 a735460c3f
commit 2c93b93e60
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/perkeepd/ui/index.js
View File

@ -241,10 +241,10 @@ cam.IndexPage = React.createClass({
var generalAspects = [
this.getSearchAspect_.bind(null, specificAspects),
cam.PermanodeDetail.getAspect.bind(null, this.props.serverConnection, this.props.timer, this.toggleKeyNavigation_),
cam.MapAspect.getAspect.bind(null, this.props.config,
this.props.availWidth, this.props.availHeight - this.HEADER_HEIGHT_,
this.updateSearchBarOnMap_, this.setPendingQuery_, this.childSearchSession_),
cam.PermanodeDetail.getAspect.bind(null, this.props.serverConnection, this.props.timer, this.toggleKeyNavigation_),
cam.BlobDetail.getAspect.bind(null, this.getDetailURL_, this.props.serverConnection),
].map(getAspect).filter(goog.functions.identity);