haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-07 09:51:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into update_txt_file_save_mechanism

Browse Source
This commit is contained in:
Leo
2019-04-19 21:59:11 +08:00
committed by GitHub
parent 58440a94b9 42a7b06134
commit 5a5c98dbbf
56 changed files with 1962 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/file-view/file-view.js
View File

@@ -20,7 +20,6 @@ const { isStarred, isLocked, lockedByMe,
repoID, filePath, enableWatermark, userNickName
} = window.app.pageOptions;
class FileView extends React.Component {
constructor(props) {
@@ -29,7 +28,7 @@ class FileView extends React.Component {
isStarred: isStarred,
isLocked: isLocked,
lockedByMe: lockedByMe,
isCommentPanelOpen: false,
isCommentPanelOpen: false
};
}
@@ -76,7 +75,7 @@ class FileView extends React.Component {
render() {
return (
<div className="h-100 d-flex flex-column">
<div className="file-view-header d-flex justify-content-between">
<div className="file-view-header d-flex justify-content-between align-items-center">
<FileInfo
isStarred={this.state.isStarred}
isLocked={this.state.isLocked}
@@ -85,9 +84,6 @@ class FileView extends React.Component {
<FileToolbar
isLocked={this.state.isLocked}
lockedByMe={this.state.lockedByMe}
onSaveChangedContent={this.props.onSaveChangedContent}
isSaving={this.props.isSaving}
isContentChangedButNotSaved={this.props.isContentChangedButNotSaved}
toggleLockFile={this.toggleLockFile}
toggleCommentPanel={this.toggleCommentPanel}
/>