diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/issue.js | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index fa4d95887c6..91e696f5320 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -43,9 +43,6 @@ class Issue { initIssueBtnEventListeners() { const issueFailMessage = 'Unable to update this issue at this time.'; - const isClosedBadge = $('div.status-box-closed'); - const isOpenBadge = $('div.status-box-open'); - const projectIssuesCounter = $('.issue_counter'); return $(document).on('click', 'a.btn-close, a.btn-reopen', (e) => { var $button, shouldSubmit, url; @@ -66,6 +63,10 @@ class Issue { }) .fail(() => new Flash(issueFailMessage)) .done((data) => { + const isClosedBadge = $('div.status-box-closed'); + const isOpenBadge = $('div.status-box-open'); + const projectIssuesCounter = $('.issue_counter'); + if ('id' in data) { $(document).trigger('issuable:change'); @@ -91,7 +92,8 @@ class Issue { } else { new Flash(issueFailMessage); } - + }) + .then(() => { this.disableCloseReopenButton($button, false); }); }); diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index a485ad25ab7..10860d1363f 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -22,12 +22,12 @@ import CloseReopenReportToggle from './close_reopen_report_toggle'; return _this.showAllCommits(); }; })(this)); - + this.initTabs(); this.initMRBtnListeners(); this.initCommitMessageListeners(); this.initCloseReopenReport(); - + if ($("a.btn-close").length) { this.taskList = new gl.TaskList({ dataType: 'merge_request', |