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

[ci skip] Fix async bug of note being updated at the same time

Browse source
This commit is contained in:
Filipa Lacerda 2017-08-10 12:25:08 +01:00
parent fbf241e8ae
commit 3e0a76dae6
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@
discussion: { discussion: {
type: Object, type: Object,
required: false, required: false,
default: () => ({}),
}, },
isEditing: { isEditing: {
type: Boolean, type: Boolean,
@ -30,7 +31,6 @@
}, },
data() { data() {
return { return {
initialNote: this.noteBody,
note: this.noteBody, note: this.noteBody,
conflictWhileEditing: false, conflictWhileEditing: false,
isSubmitting: false, isSubmitting: false,
@ -72,10 +72,7 @@
}, },
editMyLastNote() { editMyLastNote() {
if (this.note === '') { if (this.note === '') {
const lastNoteInDiscussion = this.getDiscussionLastNote( const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion);
this.discussion,
this.currentUserId,
);
if (lastNoteInDiscussion) { if (lastNoteInDiscussion) {
eventHub.$emit('enterEditMode', { eventHub.$emit('enterEditMode', {
@ -86,7 +83,7 @@
}, },
cancelHandler(shouldConfirm = false) { cancelHandler(shouldConfirm = false) {
// Sends information about confirm message and if the textarea has changed // Sends information about confirm message and if the textarea has changed
this.$emit('cancelFormEdition', shouldConfirm, this.initialNote !== this.note); this.$emit('cancelFormEdition', shouldConfirm, this.noteBody !== this.note);
}, },
}, },
mounted() { mounted() {
@ -94,7 +91,7 @@
}, },
watch: { watch: {
noteBody() { noteBody() {
if (this.note === this.initialNote) { if (this.note === this.noteBody) {
this.note = this.noteBody; this.note = this.noteBody;
} else { } else {
this.conflictWhileEditing = true; this.conflictWhileEditing = true;
@ -157,3 +154,4 @@
</form> </form>
</div> </div>
</template> </template>