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

Merge branch 'comment-button-status-refresh' into 'master'
47b0c6b5 · Jacob Schatz · 9f0349ae · 741cf430 · 47b0c6b5
Commit 47b0c6b5 authored Mar 03, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

notes.js.coffee app/assets/javascripts/notes.js.coffee +3 -3

No files found.
--- 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