diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-04 14:41:26 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-07 14:57:28 +0100 |
commit | d7c383a0ee2ec71e5ef941ccec1de0aaf1ecc8b6 (patch) | |
tree | bf3bf9a14b729df53c7cb379a638c190475705a1 /app/assets/javascripts | |
parent | c53f2d8ebc64ef59f67265ae7c6b96a3c127cea7 (diff) | |
download | gitlab-ce-d7c383a0ee2ec71e5ef941ccec1de0aaf1ecc8b6.tar.gz |
Fixed MR single button submit failure and attempted to tidy up close_reopen partials using issuable_helpers and setDisable will use true as default bool
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/close_reopen_report_toggle.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/issue.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/merge_request.js | 10 |
3 files changed, 3 insertions, 11 deletions
diff --git a/app/assets/javascripts/close_reopen_report_toggle.js b/app/assets/javascripts/close_reopen_report_toggle.js index 43467a7e277..882d20671cc 100644 --- a/app/assets/javascripts/close_reopen_report_toggle.js +++ b/app/assets/javascripts/close_reopen_report_toggle.js @@ -44,7 +44,7 @@ class CloseReopenReportToggle { return isClosed ? [this.reopenItem, this.closeItem] : [this.closeItem, this.reopenItem]; } - setDisable(shouldDisable) { + setDisable(shouldDisable = true) { if (shouldDisable) { this.button.setAttribute('disabled', 'true'); this.dropdownTrigger.setAttribute('disabled', 'true'); diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 70007d4d4af..fa4d95887c6 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -57,7 +57,7 @@ class Issue { Issue.submitNoteForm($button.closest('form')); } - this.disableCloseReopenButton($button, true); + this.disableCloseReopenButton($button); url = $button.attr('href'); return $.ajax({ diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index cae2f290f87..a485ad25ab7 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -69,7 +69,7 @@ import CloseReopenReportToggle from './close_reopen_report_toggle'; return; } - _this.disableCloseReopenButton($this, true); + if (this.closeReopenReportToggle) this.closeReopenReportToggle.setDisable(); if (shouldSubmit) { if ($this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')) { @@ -145,14 +145,6 @@ import CloseReopenReportToggle from './close_reopen_report_toggle'; this.closeReopenReportToggle.initDroplab(); }; - MergeRequest.prototype.disableCloseReopenButton = function ($button, shouldDisable) { - if (this.closeReopenReportToggle) { - this.closeReopenReportToggle.setDisable(shouldDisable); - } else { - $button.prop('disabled', shouldDisable); - } - }; - return MergeRequest; })(); }).call(window); |