diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-09 15:02:10 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-09 15:02:10 +0400 |
| commit | 29e7647a0812d2a7350722b5f2c72eca97c92047 (patch) | |
| tree | 9ad714cf9c8fc2abe3546ff3aba9e05b9930c8a3 /app | |
| parent | 60ea455d08ce13360eca1c0738b0714c574f6f81 (diff) | |
| parent | dac5e6de5a679aae51ca14481bf3f7d9cad0eb3b (diff) | |
Merge branch 'close_button_after_added_comment' into 'master'
Close button after added comment
Fixes #1549
See merge request !1070
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 51c617bd584..597d6d26b69 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -26,6 +26,7 @@ class Notes # Reopen and close actions for Issue/MR combined with note form submit $(document).on "click", ".js-note-target-reopen", @targetReopen $(document).on "click", ".js-note-target-close", @targetClose + $(document).on "click", ".js-comment-button", @updateCloseButton $(document).on "keyup", ".js-note-text", @updateTargetButtons # remove a note (in general) @@ -496,6 +497,11 @@ class Notes if noteText.trim().length > 0 form.submit() + updateCloseButton: (e) => + textarea = $(e.target) + form = textarea.parents('form') + form.find('.js-note-target-close').text('Close') + updateTargetButtons: (e) => textarea = $(e.target) form = textarea.parents('form') |