diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 10:58:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 10:58:34 +0000 |
| commit | 40c3675372320febf5264061c9bcd63db2dfd13c (patch) | |
| tree | 9e95e50902f78d191293607cecdc83bdc2ba20a3 | |
| parent | ccab346a7899d34ffcdd0169dbc87450eb2aca59 (diff) | |
| parent | 351e61f4b27f287778cf778a41f1a4e4cef977e2 (diff) | |
| download | gitlab-ce-40c3675372320febf5264061c9bcd63db2dfd13c.tar.gz | |
Merge branch 'clear-note-form-on-succcess' into 'master'
Prevent note form from being cleared when submitting failed.
When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted :cry:
See merge request !468
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b176e6826cb..d7381261639 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,6 +49,7 @@ v 7.10.0 (unreleased) - AJAX selectbox for issue assignee and author filters - Fix issue with missing options in issue filtering dropdown if selected one - Prevent holding Control-Enter or Command-Enter from posting comment multiple times. + - Prevent note form from being cleared when submitting failed. v 7.9.0 - Send EmailsOnPush email when branch or tag is created or deleted. diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index b61c4dd6544..6dfe10f0006 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -37,7 +37,8 @@ class @Notes $(document).on "click", ".js-note-attachment-delete", @removeAttachment # reset main target form after submit - $(document).on "ajax:complete", ".js-main-target-form", @resetMainTargetForm + $(document).on "ajax:complete", ".js-main-target-form", @reenableTargetFormSubmitButton + $(document).on "ajax:success", ".js-main-target-form", @resetMainTargetForm # update the file name when an attachment is selected $(document).on "change", ".js-note-attachment-input", @updateFormAttachment @@ -71,6 +72,7 @@ class @Notes $(document).off "click", ".js-note-delete" $(document).off "click", ".js-note-attachment-delete" $(document).off "ajax:complete", ".js-main-target-form" + $(document).off "ajax:success", ".js-main-target-form" $(document).off "click", ".js-discussion-reply-button" $(document).off "click", ".js-add-diff-note-button" $(document).off "visibilitychange" @@ -170,6 +172,11 @@ class @Notes form.find(".js-note-text").data("autosave").reset() + reenableTargetFormSubmitButton: -> + form = $(".js-main-target-form") + + form.find(".js-note-text").trigger "input" + ### Shows the main form and does some setup on it. |