diff options
| author | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2016-01-14 15:54:15 +0100 |
|---|---|---|
| committer | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2016-01-14 15:54:15 +0100 |
| commit | 3102575316e6eac937eb865346e0d78935c37362 (patch) | |
| tree | 5434a52528390e18ac68ff705f19f8441a952f57 /app/assets/javascripts/merge_request.js.coffee | |
| parent | e29ce9ac267e6724945b9558d069dda2b2ec2755 (diff) | |
| parent | b6ae2def2cb2b1da3ddcb3ceee556628a1147cc4 (diff) | |
| download | gitlab-ce-3102575316e6eac937eb865346e0d78935c37362.tar.gz | |
updatepr-page-fix1
Diffstat (limited to 'app/assets/javascripts/merge_request.js.coffee')
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index ed0bf2b3f48..1f46e331427 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -48,14 +48,15 @@ class @MergeRequest _this = @ $('a.btn-close, a.btn-reopen').on 'click', (e) -> $this = $(this) - if $this.data('submitted') - return - e.preventDefault() - e.stopImmediatePropagation() shouldSubmit = $this.hasClass('btn-comment') - console.log("shouldSubmit") + if shouldSubmit && $this.data('submitted') + return if shouldSubmit - _this.submitNoteForm($this.closest('form'),$this) + if $this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen') + e.preventDefault() + e.stopImmediatePropagation() + _this.submitNoteForm($this.closest('form'),$this) + submitNoteForm: (form, $button) => noteText = form.find("textarea.js-note-text").val() |