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

update codes for slate (#3170)

Browse Source
This commit is contained in:
Michael An
2019-03-25 11:49:47 +08:00
committed by Daniel Pan
parent 8dec69ca4b
commit 774143554f
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/components/file-view/comment-panel.js
View File

@@ -10,7 +10,8 @@ import '../../css/comments-list.css';
const { username, repoID, filePath } = window.app.pageOptions; const { username, repoID, filePath } = window.app.pageOptions;
const CommentPanelPropTypes = { const CommentPanelPropTypes = {
toggleCommentPanel: PropTypes.func.isRequired toggleCommentPanel: PropTypes.func.isRequired,
commentsNumber: PropTypes.number,
}; };
class CommentPanel extends React.Component { class CommentPanel extends React.Component {
@@ -75,6 +76,12 @@ class CommentPanel extends React.Component {
this.listComments(); this.listComments();
} }
componentWillReceiveProps(nextProps) {
if (this.props.commentsNumber !== nextProps.commentsNumber) {
this.listComments();
}
}
render() { render() {
return ( return (
<div className="seafile-comment"> <div className="seafile-comment">

4
frontend/src/draft.js
View File

@@ -541,10 +541,10 @@ class Draft extends React.Component {
let newNativeRange = document.createRange(); let newNativeRange = document.createRange();
newNativeRange.setStartBefore(startNode); newNativeRange.setStartBefore(startNode);
newNativeRange.setEndAfter(startNode); newNativeRange.setEndAfter(startNode);
this.range = findRange(newNativeRange, this.refs.diffViewer.value); this.range = findRange(newNativeRange, this.refs.diffViewer);
} }
else { else {
this.range = findRange(nativeRange, this.refs.diffViewer.value); this.range = findRange(nativeRange, this.refs.diffViewer);
} }
if (!this.range) { if (!this.range) {
return; return;

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

@@ -752,11 +752,13 @@ class MarkdownEditor extends React.Component {
newNativeRange.setStartBefore(startNode); newNativeRange.setStartBefore(startNode);
newNativeRange.setEndAfter(startNode); newNativeRange.setEndAfter(startNode);
this.range = findRange(newNativeRange, this.state.value); let editor = {value: this.state.value};
this.range = findRange(nativeRange, editor);
} }
else { else {
this.range = findRange(nativeRange, this.state.value); let editor = {value: this.state.value};
this.range = findRange(nativeRange, editor);
} }
if (!this.range) return; if (!this.range) return;
let rect = nativeRange.getBoundingClientRect(); let rect = nativeRange.getBoundingClientRect();
@@ -1011,7 +1013,8 @@ class MarkdownEditor extends React.Component {
scrollToNode={this.scrollToNode} scrollToNode={this.scrollToNode}
/> />
} }
{this.state.isShowComments && <CommentPanel toggleCommentPanel={this.toggleCommentList}/>} {this.state.isShowComments &&
<CommentPanel toggleCommentPanel={this.toggleCommentList} commentsNumber={this.state.commentsNumber}/>}
</div> </div>
<div className="seafile-md-viewer-side-panel"> <div className="seafile-md-viewer-side-panel">
{ {