grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing comment edits stalling. Fixes #846

Browse source
This commit is contained in:
Dessalines 2020-06-27 09:03:34 -04:00
parent 96f133750d
commit 208c17dcc8
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ui/src/components/comment-form.tsx vendored
View file

@ -245,7 +245,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
}); });
} }
handleFinished(data: CommentResponse) { handleFinished(op: UserOperation, data: CommentResponse) {
let isReply = let isReply =
this.props.node !== undefined && data.comment.parent_id !== null; this.props.node !== undefined && data.comment.parent_id !== null;
let xor = let xor =
@ -253,11 +253,16 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
if ( if (
(data.comment.creator_id == UserService.Instance.user.id && (data.comment.creator_id == UserService.Instance.user.id &&
// If its a reply, make sure parent child match ((op == UserOperation.CreateComment &&
isReply && // If its a reply, make sure parent child match
data.comment.parent_id == this.props.node.comment.id) || isReply &&
// Otherwise, check the XOR of the two data.comment.parent_id == this.props.node.comment.id) ||
(!isReply && xor) // Otherwise, check the XOR of the two
(!isReply && xor))) ||
// If its a comment edit, only check that its from your user, and that its a
// text edit only
(op == UserOperation.EditComment && data.comment.content)
) { ) {
this.state.previewMode = false; this.state.previewMode = false;
this.state.loading = false; this.state.loading = false;
@ -373,10 +378,10 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
if (UserService.Instance.user) { if (UserService.Instance.user) {
if (res.op == UserOperation.CreateComment) { if (res.op == UserOperation.CreateComment) {
let data = res.data as CommentResponse; let data = res.data as CommentResponse;
this.handleFinished(data); this.handleFinished(res.op, data);
} else if (res.op == UserOperation.EditComment) { } else if (res.op == UserOperation.EditComment) {
let data = res.data as CommentResponse; let data = res.data as CommentResponse;
this.handleFinished(data); this.handleFinished(res.op, data);
} }
} }
} }