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

1 files changed, 1 insertions, 9 deletions

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);