kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

[ci skip] Show errors close to the textarea

Browse source
This commit is contained in:
Filipa Lacerda 2017-08-03 14:56:01 +01:00
parent 0d78eeb2a8
commit fe81e7b754
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/notes/components/issue_comment_form.vue
View file

@ -98,7 +98,11 @@
if (res.errors.commands_only) { if (res.errors.commands_only) {
this.discard(); this.discard();
} else { } else {
Flash('Something went wrong while adding your comment. Please try again.'); Flash(
'Something went wrong while adding your comment. Please try again.',
'alert',
$(this.$refs.commentForm),
);
} }
} else { } else {
this.discard(); this.discard();
@ -168,7 +172,7 @@
<ul <ul
v-if="isLoggedIn" v-if="isLoggedIn"
class="notes notes-form timeline new-note"> class="notes notes-form timeline new-note">
<li class="timeline-entry"> <li class="timeline-entry" ref="commentForm">
<div class="timeline-entry-inner"> <div class="timeline-entry-inner">
<div class="flash-container timeline-content"></div> <div class="flash-container timeline-content"></div>
<div class="timeline-icon hidden-xs hidden-sm"> <div class="timeline-icon hidden-xs hidden-sm">

8
app/assets/javascripts/notes/components/issue_note.vue
View file

@ -75,7 +75,7 @@
}); });
} }
}, },
formUpdateHandler(noteText) { formUpdateHandler(noteText, parentElement) {
const data = { const data = {
endpoint: this.note.path, endpoint: this.note.path,
note: { note: {
@ -92,7 +92,11 @@
// TODO: this could be moved down, by setting a prop // TODO: this could be moved down, by setting a prop
$(this.$refs.noteBody.$el).renderGFM(); $(this.$refs.noteBody.$el).renderGFM();
}) })
.catch(() => Flash('Something went wrong while editing your comment. Please try again.')); .catch(() => Flash(
'Something went wrong while editing your comment. Please try again.',
'alert',
$(parentElement),
));
}, },
formCancelHandler(shouldConfirm, isDirty) { formCancelHandler(shouldConfirm, isDirty) {
if (shouldConfirm && isDirty) { if (shouldConfirm && isDirty) {

4
app/assets/javascripts/notes/components/issue_note_body.vue
View file

@ -43,8 +43,8 @@
}); });
} }
}, },
handleFormUpdate(note) { handleFormUpdate(note, parentElement) {
this.$emit('handleFormUpdate', note); this.$emit('handleFormUpdate', note, parentElement);
}, },
formCancelHandler(shouldConfirm, isDirty) { formCancelHandler(shouldConfirm, isDirty) {
this.$emit('cancelFormEdition', shouldConfirm, isDirty); this.$emit('cancelFormEdition', shouldConfirm, isDirty);

6
app/assets/javascripts/notes/components/issue_note_form.vue
View file

@ -68,7 +68,7 @@
methods: { methods: {
handleUpdate() { handleUpdate() {
this.isSubmitting = true; this.isSubmitting = true;
this.$emit('handleFormUpdate', this.note); this.$emit('handleFormUpdate', this.note, this.$refs.editNoteForm);
}, },
editMyLastNote() { editMyLastNote() {
if (this.note === '') { if (this.note === '') {
@ -94,6 +94,7 @@
}, },
watch: { watch: {
noteBody() { noteBody() {
debugger;
if (this.note === this.initialNote) { if (this.note === this.initialNote) {
this.note = this.noteBody; this.note = this.noteBody;
} else { } else {
@ -105,7 +106,7 @@
</script> </script>
<template> <template>
<div class="note-edit-form current-note-edit-form"> <div ref="editNoteForm" class="note-edit-form current-note-edit-form">
<div <div
v-if="conflictWhileEditing" v-if="conflictWhileEditing"
class="js-conflict-edit-warning alert alert-danger"> class="js-conflict-edit-warning alert alert-danger">
@ -116,6 +117,7 @@
rel="noopener noreferrer">updated comment</a> rel="noopener noreferrer">updated comment</a>
to ensure information is not lost. to ensure information is not lost.
</div> </div>
<div class="flash-container timeline-content"></div>
<form <form
class="edit-note common-note-form"> class="edit-note common-note-form">
<markdown-field <markdown-field