diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-21 22:55:37 +0300 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-21 22:55:37 +0300 |
commit | 580220c6ccf2b541e46c4c8a1b3830195c3b5a8b (patch) | |
tree | 4e1ef65dc739f93ef78a6c92700fe63fcbdd3450 /app/assets | |
parent | f3f42f7b8f7a9e92af57e2becfc8411dafc31af6 (diff) | |
parent | 27c613cb1818f5bca695f667feb5ba12eee19d59 (diff) |
Merge branch 'backport-mr-widget-ci-js' into 'master'
Backport moving MR widget CI JS out of script tag
See merge request !8200
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 | 42 |
1 files changed, 42 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..2b074994b4a --- /dev/null +++ b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 @@ -0,0 +1,42 @@ +/* global merge_request_widget */ + +(() => { + $(() => { + /* 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. + * */ + + if ($('.accept-mr-form').length) { + $('.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(); + }); + } 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-rebase-button').on('click', () => { + $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress"); + }); + } else { + merge_request_widget.getMergeStatus(); + } + }); +})(); |