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

change selection (#2587)

Browse Source
This commit is contained in:
Michael An
2018-12-03 14:03:21 +08:00
committed by Daniel Pan
parent 0128d0ab01
commit cc7fd1d500
4 changed files with 107 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/review-list-view/review-comment-dialog.js
View File

@@ -67,9 +67,8 @@ class ReviewCommentDialog extends React.Component {
setQuoteText = (text) => {
if (text.length > 0) {
let comment = '> ' + text;
this.setState({
comment: comment
comment: text
});
}
}

44
frontend/src/components/review-list-view/review-comments.js
View File

@@ -12,10 +12,7 @@ import '../../css/review-comments.css';
const commentPropTypes = {
getCommentsNumber: PropTypes.func.isRequired,
inResizing: PropTypes.bool.isRequired,
commentsNumber: PropTypes.number.isRequired,
selectedText: PropTypes.string,
newIndex: PropTypes.number,
oldIndex: PropTypes.number,
commentsNumber: PropTypes.number,
scrollToQuote: PropTypes.func.isRequired
};
@@ -69,24 +66,10 @@ class ReviewComments extends React.Component {
submitComment = () => {
let comment = this.state.comment.trim();
if (comment.length > 0) {
if (this.props.selectedText.length > 0) {
let detail = {
selectedText: this.props.selectedText.slice(0, 10),
newIndex: this.props.newIndex,
oldIndex: this.props.oldIndex
};
let detailJSON = JSON.stringify(detail);
seafileAPI.addReviewComment(reviewID, comment, detailJSON).then((response) => {
this.listComments(true);
this.props.getCommentsNumber();
});
}
else {
seafileAPI.addReviewComment(reviewID, comment).then((response) => {
this.listComments(true);
this.props.getCommentsNumber();
});
}
seafileAPI.addReviewComment(reviewID, comment).then((response) => {
this.listComments(true);
this.props.getCommentsNumber();
});
this.setState({
comment: ''
});
@@ -148,15 +131,6 @@ class ReviewComments extends React.Component {
commentFooterHeight: rate
});
};
setQuoteText = (text) => {
if (text.length > 0) {
let comment = '> ' + text;
this.setState({
comment: comment
});
}
}
scrollToQuote = (newIndex, oldIndex, selectedText) => {
this.props.scrollToQuote(newIndex, oldIndex, selectedText);
@@ -170,13 +144,9 @@ class ReviewComments extends React.Component {
this.listComments();
}
componentDidMount() {
this.setQuoteText(this.props.selectedText);
}
componentWillReceiveProps(nextProps) {
if (this.props.selectedText !== nextProps.selectedText) {
this.setQuoteText(nextProps.selectedText);
if (this.props.commentsNumber !== nextProps.commentsNumber) {
this.listComments();
}
}