From c884dfc2edb814c41c30b4892d6af06bde551e97 Mon Sep 17 00:00:00 2001 From: Michael An <1822852997@qq.com> Date: Mon, 24 Jun 2019 15:44:22 +0800 Subject: [PATCH] add comment in dirent detail --- frontend/package-lock.json | 6 +++--- frontend/package.json | 2 +- .../dialog/lib-sub-folder-set-group-permission-dialog.js | 4 ++-- frontend/src/components/dirent-detail/dirent-details.js | 4 ++-- frontend/src/components/review-list-view/review-comments.js | 1 - .../shared-repo-list-view/shared-repo-list-item.js | 2 +- frontend/src/wiki.js | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9863c06d8a..95d0c22aac 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -158,9 +158,9 @@ "integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA==" }, "@seafile/seafile-editor": { - "version": "0.2.40", - "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.40.tgz", - "integrity": "sha512-6xBlf06sF1o802aRAdps9tWE02qpl2Dd0x3s7aYTxp8MoN+2/S5Tqt85Y4fOWOt0ZSvAaK48K7v7DCVoW3jKMQ==", + "version": "0.2.41", + "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.41.tgz", + "integrity": "sha512-avaxxHbnJugB4c6PI/Ov2rOUn+D5XnhMC4M72LK/HKT4MTMsYhvnf2LU/ZMdXX5y0YkLyoqCPFJZnsN0B4oucw==", "requires": { "@seafile/slate-react": "^0.1.8", "autoprefixer": "7.1.6", diff --git a/frontend/package.json b/frontend/package.json index 0ee9268a47..8d27aa93d8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "@seafile/react-data-grid": "^6.1.5", "@seafile/react-data-grid-addons": "^6.1.5", "@seafile/resumablejs": "^1.1.9", - "@seafile/seafile-editor": "^0.2.40", + "@seafile/seafile-editor": "^0.2.41", "MD5": "^1.3.0", "autoprefixer": "7.1.6", "classnames": "^2.2.6", diff --git a/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js b/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js index 01ea19301c..ca0993ad4b 100644 --- a/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js +++ b/frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js @@ -149,7 +149,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { const request = this.props.isDepartmentRepo ? seafileAPI.addDepartmentRepoGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id) : - seafileAPI.addGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id) + seafileAPI.addGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id); request.then(res => { let errorMsg = []; if (res.data.failed.length > 0) { @@ -185,7 +185,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component { deleteGroupPermissionItem = (item) => { const request = this.props.isDepartmentRepo ? seafileAPI.deleteDepartmentRepoGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id) : - seafileAPI.deleteGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id) + seafileAPI.deleteGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id); request.then(() => { this.setState({ groupPermissionItems: this.state.groupPermissionItems.filter(deletedItem => { return deletedItem != item; }) diff --git a/frontend/src/components/dirent-detail/dirent-details.js b/frontend/src/components/dirent-detail/dirent-details.js index b4a27e0833..0eb8b753da 100644 --- a/frontend/src/components/dirent-detail/dirent-details.js +++ b/frontend/src/components/dirent-detail/dirent-details.js @@ -202,7 +202,7 @@ class DirentDetail extends React.Component { } let direntName = dirent ? dirent.name : folderDirent.name; - if (dirent && dirent.type === 'file') { + if ((dirent && dirent.type === 'file') || path.lastIndexOf('.') > -1) { return (
{this.renderHeader(smallIconUrl, direntName)} @@ -212,7 +212,7 @@ class DirentDetail extends React.Component { diff --git a/frontend/src/components/review-list-view/review-comments.js b/frontend/src/components/review-list-view/review-comments.js index 9aa9ba9b14..504bc32459 100644 --- a/frontend/src/components/review-list-view/review-comments.js +++ b/frontend/src/components/review-list-view/review-comments.js @@ -4,7 +4,6 @@ import { processor } from '../../utils/seafile-markdown2html'; import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { seafileAPI } from '../../utils/seafile-api'; import { gettext, draftFilePath, draftRepoID } from '../../utils/constants'; -import Loading from '../../components/loading.js'; import { username } from '../../utils/constants.js'; import '../../css/review-comments.css'; diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js index b62b6019ca..caa7c21467 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js @@ -164,7 +164,7 @@ class SharedRepoListItem extends React.Component { } onItemDeleteToggle = () => { - this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow}) + this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow}); } toggleShareDialog = () => { diff --git a/frontend/src/wiki.js b/frontend/src/wiki.js index da436fb819..83b6225cdf 100644 --- a/frontend/src/wiki.js +++ b/frontend/src/wiki.js @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'; import moment from 'moment'; import MediaQuery from 'react-responsive'; import { Modal } from 'reactstrap'; -import { slug, repoID, siteRoot, initialPath, isDir, sharedToken, hasIndex } from './utils/constants'; +import { slug, siteRoot, initialPath, isDir, sharedToken, hasIndex } from './utils/constants'; import { Utils } from './utils/utils'; import { seafileAPI } from './utils/seafile-api'; import Dirent from './models/dirent';