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

fix warnings (#3201)

Browse Source
This commit is contained in:
Michael An
2019-04-08 13:51:34 +08:00
committed by Daniel Pan
parent 314ed1fc65
commit 5f350de460
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dialog/org-add-admin-dialog.js
View File

@@ -26,7 +26,7 @@ class AddOrgAdminDialog extends React.Component {
addOrgAdmin = () => { addOrgAdmin = () => {
if (this.state.selectedOption) { if (this.state.selectedOption) {
let userEmail = this.state.selectedOption.email; let userEmail = this.state.selectedOption.email;
this.props.addOrgAdmin(userEmail) this.props.addOrgAdmin(userEmail);
} }
} }

4
frontend/src/components/dialog/related-file-dialogs.js
View File

@@ -62,10 +62,10 @@ class RelatedFileDialogs extends React.Component {
} }
</Modal> </Modal>
</ModalPortal> </ModalPortal>
) );
} }
} }
RelatedFileDialogs.propTypes = propTypes; RelatedFileDialogs.propTypes = propTypes;
export default RelatedFileDialogs export default RelatedFileDialogs;

2
frontend/src/components/toolbar/view-file-toolbar.js
View File

@@ -81,7 +81,7 @@ class ViewFileToolbar extends React.Component {
this.setState({ this.setState({
isRelatedFileDialogShow: false, isRelatedFileDialogShow: false,
showRelatedFileDialog: false, showRelatedFileDialog: false,
}) });
} }
render() { render() {

16
frontend/src/draft.js
View File

@@ -171,7 +171,7 @@ class Draft extends React.Component {
}); });
})); }));
break; break;
} }
} }
onHistoryItemClick = (currentItem, preItem, activeItem) => { onHistoryItemClick = (currentItem, preItem, activeItem) => {
@@ -713,7 +713,7 @@ class Draft extends React.Component {
if (!draftFileExists) { if (!draftFileExists) {
return ( return (
<Nav tabs className="review-side-panel-nav"> <Nav tabs className="review-side-panel-nav">
{this.showNavItem('info')} {this.showNavItem('info')}
</Nav> </Nav>
); );
} }
@@ -768,12 +768,12 @@ class Draft extends React.Component {
<span className="sf2-icon-review"></span> <span className="sf2-icon-review"></span>
</div> </div>
<div className="info-item file-info"> <div className="info-item file-info">
<React.Fragment> <React.Fragment>
<span className="file-name">{draftFileName}</span> <span className="file-name">{draftFileName}</span>
{draftFileExists && {draftFileExists &&
<a href={draftLink} className="draft-link">{gettext('Edit draft')}</a> <a href={draftLink} className="draft-link">{gettext('Edit draft')}</a>
} }
</React.Fragment> </React.Fragment>
</div> </div>
</div> </div>
<div className="button-group"> <div className="button-group">

53
frontend/src/markdown-editor.js
View File

@@ -470,20 +470,20 @@ class MarkdownEditor extends React.Component {
switch(option) switch(option)
{ {
case 'related_files': case 'related_files':
if (this.state.relatedFiles.length > 0) { if (this.state.relatedFiles.length > 0) {
this.setState({ this.setState({
showRelatedFileDialog: true, showRelatedFileDialog: true,
showMarkdownEditorDialog: true, showMarkdownEditorDialog: true,
viewMode: 'list_related_file', viewMode: 'list_related_file',
}); });
} }
else { else {
this.setState({ this.setState({
showRelatedFileDialog: true, showRelatedFileDialog: true,
showMarkdownEditorDialog: true, showMarkdownEditorDialog: true,
viewMode: 'add_related_file', viewMode: 'add_related_file',
}); });
} }
break; break;
case 'tags': case 'tags':
this.setState({ this.setState({
@@ -515,11 +515,12 @@ class MarkdownEditor extends React.Component {
} }
componentWillUnmount() { componentWillUnmount() {
this.socket.emit('repo_update', { this.socket.emit('repo_update', {
request: 'unwatch_update', request: 'unwatch_update',
repo_id: this.props.c.repoID, repo_id: editorUtilities.repoID,
user: { user: {
name: editorUtilities.name, name: editorUtilities.name,
username: editorUtilities.username, username: editorUtilities.username,
contact_email: editorUtilities.contact_email, contact_email: editorUtilities.contact_email,
}, },
@@ -579,7 +580,7 @@ class MarkdownEditor extends React.Component {
request: 'watch_update', request: 'watch_update',
repo_id: editorUtilities.repoID, repo_id: editorUtilities.repoID,
user: { user: {
name: editorUtilities.name, name: editorUtilities.name,
username: editorUtilities.username, username: editorUtilities.username,
contact_email: editorUtilities.contact_email, contact_email: editorUtilities.contact_email,
}, },
@@ -676,8 +677,8 @@ class MarkdownEditor extends React.Component {
}); });
}, 3000); }, 3000);
that.timer = null; that.timer = null;
}, 60000); }, 60000);
} }
} }
backToParentDirectory = () => { backToParentDirectory = () => {
@@ -964,8 +965,8 @@ class MarkdownEditor extends React.Component {
render() { render() {
let component; let component;
let sidePanel = this.state.isShowHistory ? true : false; let sidePanel = this.state.isShowHistory ? true : false;
let markdownViewer = sidePanel ? "seafile-md-viewer-slate side-panel-on" : let markdownViewer = sidePanel ? 'seafile-md-viewer-slate side-panel-on' :
(this.state.isShowComments ? "seafile-md-viewer-slate comment-on" : "seafile-md-viewer-slate"); (this.state.isShowComments ? 'seafile-md-viewer-slate comment-on' : 'seafile-md-viewer-slate');
if (this.state.loading) { if (this.state.loading) {
return ( return (
<div className="empty-loading-page"> <div className="empty-loading-page">
@@ -997,7 +998,7 @@ class MarkdownEditor extends React.Component {
toggleHistory={this.toggleHistory} toggleHistory={this.toggleHistory}
/> />
<div className="seafile-md-viewer d-flex"> <div className="seafile-md-viewer d-flex">
<div className={sidePanel ? "seafile-md-viewer-container side-panel-on":"seafile-md-viewer-container"} ref="markdownContainer"> <div className={sidePanel ? 'seafile-md-viewer-container side-panel-on' : 'seafile-md-viewer-container'} ref="markdownContainer">
{ {
this.state.isShowHistory ? this.state.isShowHistory ?
<div className="diff-container"> <div className="diff-container">
@@ -1018,8 +1019,8 @@ class MarkdownEditor extends React.Component {
siteRoot={siteRoot} siteRoot={siteRoot}
value={this.state.value} value={this.state.value}
/> />
{this.state.isShowComments && {this.state.isShowComments &&
<i className="fa fa-plus-square seafile-viewer-comment-btn" ref="commentbtn" onMouseDown={this.addComment}></i>} <i className="fa fa-plus-square seafile-viewer-comment-btn" ref="commentbtn" onMouseDown={this.addComment}></i>}
</div> </div>
} }
{ {
@@ -1074,12 +1075,12 @@ class MarkdownEditor extends React.Component {
fileTagList={this.state.fileTagList} fileTagList={this.state.fileTagList}
deleteDraft={this.deleteDraft} deleteDraft={this.deleteDraft}
showDraftSaved={this.state.showDraftSaved} showDraftSaved={this.state.showDraftSaved}
/> />;
} }
return ( return (
<React.Fragment> <React.Fragment>
{this.state.localDraftDialog? {this.state.localDraftDialog ?
<ModalPortal> <ModalPortal>
<LocalDraftDialog <LocalDraftDialog
localDraftDialog={this.state.localDraftDialog} localDraftDialog={this.state.localDraftDialog}