diff --git a/frontend/src/components/dialog/add-abuse-report-dialog.js b/frontend/src/components/dialog/add-abuse-report-dialog.js index 2fd194d63a..6ec7858c18 100644 --- a/frontend/src/components/dialog/add-abuse-report-dialog.js +++ b/frontend/src/components/dialog/add-abuse-report-dialog.js @@ -78,11 +78,11 @@ class AddAbuseReportDialog extends React.Component { - + this.setReporter(event)}/> - + this.setDescription(event)}/> diff --git a/frontend/src/components/file-uploader/upload-list-item.js b/frontend/src/components/file-uploader/upload-list-item.js index 01c4ae0794..df3a54ba97 100644 --- a/frontend/src/components/file-uploader/upload-list-item.js +++ b/frontend/src/components/file-uploader/upload-list-item.js @@ -20,7 +20,7 @@ class UploadListItem extends React.Component { super(props); this.state = { uploadState: UPLOAD_UPLOADING - } + }; } componentWillReceiveProps(nextProps) { @@ -49,7 +49,7 @@ class UploadListItem extends React.Component { onUploadRetry = (e) => { e.preventDefault(); - this.props.onUploadRetry(this.props.resumableFile) + this.props.onUploadRetry(this.props.resumableFile); } formatFileSize = (size) => { diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 5874571039..3a49a87939 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -68,11 +68,11 @@ class MainSideNav extends React.Component { if (window.uploader && window.uploader.isUploadProgressDialogShow && window.uploader.totalProgress !== 100) { - if (!window.confirm(gettext('A file is being uploaded. Are you sure you want to leave this page?'))) { - e.preventDefault(); - return false; - } - window.uploader.isUploadProgressDialogShow = false; + if (!window.confirm(gettext('A file is being uploaded. Are you sure you want to leave this page?'))) { + e.preventDefault(); + return false; + } + window.uploader.isUploadProgressDialogShow = false; } this.props.tabItemClick(param, id); } diff --git a/frontend/src/css/share-link-dialog.css b/frontend/src/css/share-link-dialog.css index 7192bdac91..865557826c 100644 --- a/frontend/src/css/share-link-dialog.css +++ b/frontend/src/css/share-link-dialog.css @@ -3,7 +3,6 @@ min-height: 27rem; display: flex; flex-direction: row; - overflow: hidden; } .share-dialog-content .share-dialog-side { @@ -22,16 +21,17 @@ flex: 0 0 78%; padding: 1rem 1.5rem 2rem; } + .share-dialog-content .share-dialog-main .tab-content { flex: 1; } + .share-dialog-content .share-dialog-main .tab-pane { height: 100%; } .share-list-container { max-height: 18rem; - overflow: auto; height: 100%; } diff --git a/frontend/src/pages/my-libs/mylib-repo-list-item.js b/frontend/src/pages/my-libs/mylib-repo-list-item.js index ab72973bda..35a66fe4ed 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-item.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-item.js @@ -18,7 +18,7 @@ import LabelRepoStateDialog from '../../components/dialog/label-repo-state-dialo import LibSubFolderPermissionDialog from '../../components/dialog/lib-sub-folder-permission-dialog'; import Rename from '../../components/rename'; import MylibRepoMenu from './mylib-repo-menu'; -import RepoAPITokenDialog from "../../components/dialog/repo-api-token-dialog"; +import RepoAPITokenDialog from '../../components/dialog/repo-api-token-dialog'; const propTypes = { repo: PropTypes.object.isRequired, @@ -119,9 +119,9 @@ class MylibRepoListItem extends React.Component { if (this.state.isStarred) { seafileAPI.unstarItem(this.props.repo.repo_id, '/').then(() => { this.setState({isStarred: !this.state.isStarred}); - const msg = gettext('Successfully unstarred {library_name_placeholder}.') - .replace('{library_name_placeholder}', repoName); - toaster.success(msg); + const msg = gettext('Successfully unstarred {library_name_placeholder}.') + .replace('{library_name_placeholder}', repoName); + toaster.success(msg); }).catch(error => { let errMessage = Utils.getErrorMsg(error); toaster.danger(errMessage); @@ -129,9 +129,9 @@ class MylibRepoListItem extends React.Component { } else { seafileAPI.starItem(this.props.repo.repo_id, '/').then(() => { this.setState({isStarred: !this.state.isStarred}); - const msg = gettext('Successfully starred {library_name_placeholder}.') - .replace('{library_name_placeholder}', repoName); - toaster.success(msg); + const msg = gettext('Successfully starred {library_name_placeholder}.') + .replace('{library_name_placeholder}', repoName); + toaster.success(msg); }).catch(error => { let errMessage = Utils.getErrorMsg(error); toaster.danger(errMessage); diff --git a/frontend/src/pages/sys-admin/users/user-nav.js b/frontend/src/pages/sys-admin/users/user-nav.js index b37068a6e6..1549a2316f 100644 --- a/frontend/src/pages/sys-admin/users/user-nav.js +++ b/frontend/src/pages/sys-admin/users/user-nav.js @@ -23,7 +23,7 @@ class Nav extends React.Component { render() { const { currentItem, email, userName } = this.props; return ( -
+

{gettext('Users')} / {userName}