diff options
author | kushalpandya <kushal@gitlab.com> | 2017-05-04 23:29:53 +0530 |
---|---|---|
committer | kushalpandya <kushal@gitlab.com> | 2017-05-04 23:29:53 +0530 |
commit | d0d86e65cdbe26fa0e184225fa03bb63c20f2907 (patch) | |
tree | 6b11ad7bec45082d6fc3bfd7f36694fb9a841789 /app/assets/javascripts/notes.js | |
parent | c8073885afa5088ae9474a66eb78931dbf4964c1 (diff) | |
download | gitlab-ce-d0d86e65cdbe26fa0e184225fa03bb63c20f2907.tar.gz |
Update broken class name, add `ajax:*` listeners
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r-- | app/assets/javascripts/notes.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 5514e11778b..93b2254b95c 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -113,6 +113,11 @@ const normalizeNewlines = function(str) { $(document).on("visibilitychange", this.visibilityChange); // when issue status changes, we need to refresh data $(document).on("issuable:change", this.refresh); + // ajax:events that happen on Form when actions like Reopen, Close are performed on Issues and MRs. + $(document).on("ajax:success", ".js-main-target-form", this.addNote); + $(document).on("ajax:success", ".js-discussion-note-form", this.addDiscussionNote); + $(document).on("ajax:success", ".js-main-target-form", this.resetMainTargetForm); + $(document).on("ajax:complete", ".js-main-target-form", this.reenableTargetFormSubmitButton); // when a key is clicked on the notes return $(document).on("keydown", ".js-note-text", this.keydownNoteText); }; @@ -132,6 +137,9 @@ const normalizeNewlines = function(str) { $(document).off("keydown", ".js-note-text"); $(document).off('click', '.js-comment-resolve-button'); $(document).off("click", '.system-note-commit-list-toggler'); + $(document).off("ajax:success", ".js-main-target-form"); + $(document).off("ajax:success", ".js-discussion-note-form"); + $(document).off("ajax:complete", ".js-main-target-form"); }; Notes.initCommentTypeToggle = function (form) { @@ -1339,7 +1347,7 @@ const normalizeNewlines = function(str) { const $submitBtn = $(e.target); const $form = $submitBtn.parents('form'); const $closeBtn = $form.find('.js-note-target-close'); - const $editingNote = $form.parents('.note.is-editting'); + const $editingNote = $form.parents('.note.is-editing'); const $noteBody = $editingNote.find('.js-task-list-container'); const $noteBodyText = $noteBody.find('.note-text'); const { formData, formContent, formAction } = this.getFormData($form); @@ -1349,7 +1357,7 @@ const normalizeNewlines = function(str) { // Show updated comment content temporarily $noteBodyText.html(formContent); - $editingNote.removeClass('is-editting').addClass('being-posted fade-in-half'); + $editingNote.removeClass('is-editing').addClass('being-posted fade-in-half'); $editingNote.find('.note-headline-meta a').html('<i class="fa fa-spinner fa-spin" aria-label="Comment is being updated" aria-hidden="true"></i>'); /* eslint-disable promise/catch-or-return */ |