Backport moving MR widget CI JS out of script tag.

1 files changed, 24 insertions, 0 deletions

diff --git a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
new file mode 100644
index 00000000000..02397561657
--- /dev/null
+++ b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
@@ -0,0 +1,24 @@
+$(() => {
+  /* TODO: This needs a better home, or should be refactored. It was previously contained
+   * in a script tag in app/views/projects/merge_requests/widget/open/_accept.html.haml,
+   * but Vue chokes on script tags and prevents their execution. So it was moved here
+   * temporarily.
+   * */
+
+  $('.accept-mr-form').on('ajax:send', () => {
+    $('.accept-mr-form :input').disable();
+  });
+
+  $('.accept_merge_request').on('click', () => {
+    $('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
+  });
+
+  $('.merge_when_build_succeeds').on('click', () => {
+    $('#merge_when_build_succeeds').val('1');
+  });
+
+  $('.js-merge-dropdown a').on('click', (e) => {
+    e.preventDefault();
+    $(this).closest('form').submit();
+  });
+});