haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2644 from haiwen/search-module-improve

Browse Source 
Search module improve
This commit is contained in:
Daniel Pan
2018-12-14 10:45:33 +08:00
committed by GitHub
parent 0d629a4f8e ca0850f663
commit 0f5d811c33
10 changed files with 94 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/toolbar/common-toolbar.js
View File

@@ -13,12 +13,13 @@ const propTypes = {
class CommonToolbar extends React.Component {
render() {
let searchPlaceholder = this.props.searchPlaceholder || 'Search Files'
return (
<div className="common-toolbar">
{isPro && (
<Search
repoID={this.props.repoID}
placeholder={gettext(this.props.searchPlaceholder)}
placeholder={gettext(searchPlaceholder)}
onSearchedClick={this.props.onSearchedClick}
/>
)}

4
frontend/src/components/toolbar/general-toolbar.js
View File

@@ -13,7 +13,6 @@ class GeneralToolbar extends React.Component {
render() {
// todo get repoID?
let { onShowSidePanel, onSearchedClick } = this.props;
let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
return (
<div className="main-panel-north">
<div className="cur-view-toolbar">
@@ -24,8 +23,7 @@ class GeneralToolbar extends React.Component {
</span>
</div>
<CommonToolbar
repoID={'todo'}
searchPlaceholder={placeHolder}
searchPlaceholder={this.props.searchPlaceholder}
onSearchedClick={onSearchedClick}
/>
</div>

3
frontend/src/components/toolbar/groups-toolbar.js
View File

@@ -19,7 +19,6 @@ class GroupsToolbar extends React.Component {
render() {
let { onShowSidePanel, onSearchedClick } = this.props;
let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
return (
<div className="main-panel-north">
<div className="cur-view-toolbar">
@@ -32,7 +31,7 @@ class GroupsToolbar extends React.Component {
className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none">
</span>
</div>
<CommonToolbar searchPlaceholder={placeHolder} onSearchedClick={onSearchedClick}/>
<CommonToolbar searchPlaceholder={this.props.searchPlaceholder} onSearchedClick={onSearchedClick}/>
</div>
);
}