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

Merge "ui: renamed "Search roots" to "Favorites""

This commit is contained in:
Mathieu Lonjaret 2016-03-19 00:12:27 +00:00 committed by Gerrit Code Review
parent 724814d5c4 48695d85a0
commit 1c08a41322
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ cam.Header = React.createClass({
mainControls: React.PropTypes.arrayOf(React.PropTypes.renderable),
onNewPermanode: React.PropTypes.func,
onSearch: React.PropTypes.func,
searchRootsURL: React.PropTypes.instanceOf(goog.Uri).isRequired,
favoritesURL: React.PropTypes.instanceOf(goog.Uri).isRequired,
statusURL: React.PropTypes.instanceOf(goog.Uri).isRequired,
timer: React.PropTypes.shape({setTimeout:React.PropTypes.func.isRequired, clearTimeout:React.PropTypes.func.isRequired}).isRequired,
width: React.PropTypes.number.isRequired,
@ -224,7 +224,7 @@ cam.Header = React.createClass({
this.getMenuItem_('Importers', this.props.importersURL),
this.getMenuItem_('Server status', this.props.statusURL),
this.getMenuItem_('Search roots', this.props.searchRootsURL),
this.getMenuItem_('Favorites', this.props.favoritesURL),
this.getMenuItem_('Help', this.props.helpURL),
errorItems
);

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

@ -620,7 +620,7 @@ cam.IndexPage = React.createClass({
onUpload: this.handleUpload_,
onNewPermanode: this.handleCreateSetWithSelection_,
onSearch: this.setSearch_,
searchRootsURL: this.getSearchRootsURL_(),
favoritesURL: this.getFavoritesURL_(),
statusURL: this.baseURL_.resolve(new goog.Uri(this.props.config.statusRoot)),
ref: 'header',
timer: this.props.timer,
@ -633,7 +633,7 @@ cam.IndexPage = React.createClass({
this.props.serverConnection.createPermanode(this.getDetailURL_.bind(this));
},
getSearchRootsURL_: function() {
getFavoritesURL_: function() {
return this.baseURL_.clone().setParameterValue(
'q',
this.SEARCH_PREFIX_.RAW + ':' + JSON.stringify({