diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 19:23:28 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 19:23:28 +0000 |
commit | 47b0c6b574ad87322fd1f7b8f8bea6686230ddf0 (patch) | |
tree | 2f990ca84df78a3b64f2c4cf32ea27a35546c1e3 | |
parent | 9f0349ae39fd69c142e03c1da061228bf7965160 (diff) | |
parent | 741cf430f7608846db6fe032de5ea723fc36e316 (diff) | |
download | gitlab-ce-47b0c6b574ad87322fd1f7b8f8bea6686230ddf0.tar.gz |
Merge branch 'comment-button-status-refresh' into 'master'
Correcly updates the status of the comment buttons on reload
Closes #5534
![comment-reload](/uploads/413df488222cacfb02a5ea7592abfd11/comment-reload.gif)
See merge request !3081
-rw-r--r-- | app/assets/javascripts/notes.js.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 3347ab65c90..82a44cb2b57 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -17,10 +17,10 @@ class @Notes @noteable_url = document.URL @notesCountBadge ||= $(".issuable-details").find(".notes-tab .badge") - @initRefresh() - @setupMainTargetNoteForm() @cleanBinding() @addBinding() + @initRefresh() + @setupMainTargetNoteForm() @initTaskList() addBinding: -> @@ -37,7 +37,7 @@ class @Notes # Reopen and close actions for Issue/MR combined with note form submit $(document).on "click", ".js-comment-button", @updateCloseButton - $(document).on "keyup", ".js-note-text", @updateTargetButtons + $(document).on "keyup input", ".js-note-text", @updateTargetButtons # remove a note (in general) $(document).on "click", ".js-note-delete", @removeNote |