haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 08:53:14 +00:00
Code Issues Releases Wiki Activity

Optimized wiki code (#2566)

Browse Source 
* optimized path component

* abstract component

* repair copy bug

* move copy&move&download to list-item

* add modal portal
This commit is contained in:
杨顺强
2018-11-27 14:47:19 +08:00
committed by Daniel Pan
parent 30fa874c9f
commit 5ca5fb9cee
15 changed files with 496 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/components/dialog/move-dirent-dialog.js
View File

@@ -7,12 +7,11 @@ import FileChooser from '../file-chooser/file-chooser';
const propTypes = {
path: PropTypes.string.isRequired,
direntPath: PropTypes.string,
dirent: PropTypes.object,
selectedDirentList: PropTypes.array,
isMutipleOperation: PropTypes.bool.isRequired,
selectedDirentList: PropTypes.array.isRequired,
onItemMove: PropTypes.func.isRequired,
onItemsMove: PropTypes.func.isRequired,
onItemMove: PropTypes.func,
onItemsMove: PropTypes.func,
onCancelMove: PropTypes.func.isRequired,
};
@@ -47,7 +46,7 @@ class MoveDirent extends React.Component {
let { repo, selectedPath } = this.state;
let message = gettext('Invalid destination path');
if (!repo || (repo.repo_id === repoID) && selectedPath === '') {
if (!repo || selectedPath === '') {
this.setState({errMessage: message});
return;
}
@@ -60,13 +59,13 @@ class MoveDirent extends React.Component {
});
// copy dirents to one of them. eg: A/B, A/C -> A/B
if (direntPaths.some(direntPath => { return direntPath === selectedPath})) {
if (direntPaths.some(direntPath => { return direntPath === selectedPath;})) {
this.setState({errMessage: message});
return;
}
// copy dirents to current path
if (selectedPath && selectedPath === this.props.path) {
if (selectedPath && selectedPath === this.props.path && (repo.repo_id === repoID)) {
this.setState({errMessage: message});
return;
}
@@ -79,7 +78,7 @@ class MoveDirent extends React.Component {
moveDirentPath = direntPath;
}
return flag;
})
});
if (isChildPath) {
message = gettext('Can not move directory %(src)s to its subdirectory %(des)s');
@@ -94,8 +93,8 @@ class MoveDirent extends React.Component {
}
moveItem = () => {
let { direntPath } = this.props;
let { repo, selectedPath } = this.state;
let direntPath = Utils.joinPath(this.props.path, this.props.dirent.name);
let message = gettext('Invalid destination path');
if (!repo || (repo.repo_id === repoID && selectedPath === '')) {
@@ -153,7 +152,7 @@ class MoveDirent extends React.Component {
if (!this.props.isMutipleOperation) {
title = title.replace('{placeholder}', '<span class="sf-font">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
} else {
title = gettext("Move selected item(s) to:");
title = gettext('Move selected item(s) to:');
}
return (
<Modal isOpen={true} toggle={this.toggle}>