diff options
author | Bryce Johnson <bryce@gitlab.com> | 2016-12-20 17:41:09 +0100 |
---|---|---|
committer | Bryce Johnson <bryce@gitlab.com> | 2016-12-21 13:03:13 +0100 |
commit | 3bbe19d39bd7f2bebb1f68de99dfb791eaa7a928 (patch) | |
tree | fece150e534a224d5c454d8fa9ed4a1f0a97155c /app/assets | |
parent | 0ba41ea1c8e9d99667401c2778c7c320b96c35e0 (diff) | |
download | gitlab-ce-3bbe19d39bd7f2bebb1f68de99dfb791eaa7a928.tar.gz |
Backport moving MR widget CI JS out of script tag.
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 | 24 |
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(); + }); +}); |