Move javascript for widget check to ci_bundle.

2 files changed, 40 insertions, 25 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
index 02397561657..2b074994b4a 100644
--- a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
+++ b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
@@ -1,24 +1,42 @@
-$(() => {
-  /* 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.
-   * */
+/* global merge_request_widget */
 
-  $('.accept-mr-form').on('ajax:send', () => {
-    $('.accept-mr-form :input').disable();
-  });
+(() => {
+  $(() => {
+    /* 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_merge_request').on('click', () => {
-    $('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
-  });
+    if ($('.accept-mr-form').length) {
+      $('.accept-mr-form').on('ajax:send', () => {
+        $('.accept-mr-form :input').disable();
+      });
 
-  $('.merge_when_build_succeeds').on('click', () => {
-    $('#merge_when_build_succeeds').val('1');
-  });
+      $('.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();
+      });
+    } else if ($('.rebase-in-progress').length) {
+      merge_request_widget.rebaseInProgress();
+    } else if ($('.rebase-mr-form').length) {
+      $('.rebase-mr-form').on('ajax:send', () => {
+        $('.rebase-mr-form :input').disable();
+      });
 
-  $('.js-merge-dropdown a').on('click', (e) => {
-    e.preventDefault();
-    $(this).closest('form').submit();
+      $('.js-rebase-button').on('click', () => {
+        $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
+      });
+    } else {
+      merge_request_widget.getMergeStatus();
+    }
   });
-});
+})();
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml
index e16878ba513..50086767446 100644
--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
@@ -1,9 +1,6 @@
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_tag('merge_request_widget/ci_bundle.js')
+
 %strong
   = icon("spinner spin")
   Checking ability to merge automatically&hellip;
-
-:javascript
-  $(function() {
-    merge_request_widget.getMergeStatus();
-  });
-