Commit 62c5ce8a authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'remove-jquery-job-dropdown' into 'master'

Remove jQuery and relpace with vue event handling

See merge request gitlab-org/gitlab!44070
parents 35ae2c7b 0c451613
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
:class="cssClass" :class="cssClass"
:disabled="isDisabled" :disabled="isDisabled"
class="js-ci-action ci-action-icon-container ci-action-icon-wrapper gl-display-flex gl-align-items-center gl-justify-content-center" class="js-ci-action ci-action-icon-container ci-action-icon-wrapper gl-display-flex gl-align-items-center gl-justify-content-center"
@click="onClickAction" @click.stop="onClickAction"
> >
<gl-loading-icon v-if="isLoading" class="js-action-icon-loading" /> <gl-loading-icon v-if="isLoading" class="js-action-icon-loading" />
<gl-icon v-else :name="actionIcon" class="gl-mr-0!" /> <gl-icon v-else :name="actionIcon" class="gl-mr-0!" />
......
<script> <script>
import $ from 'jquery';
import { GlTooltipDirective } from '@gitlab/ui'; import { GlTooltipDirective } from '@gitlab/ui';
import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue';
import JobItem from './job_item.vue'; import JobItem from './job_item.vue';
...@@ -30,27 +29,7 @@ export default { ...@@ -30,27 +29,7 @@ export default {
return `${name} - ${status.label}`; return `${name} - ${status.label}`;
}, },
}, },
mounted() {
this.stopDropdownClickPropagation();
},
methods: { methods: {
/**
* When the user right clicks or cmd/ctrl + click in the group name or the action icon
* the dropdown should not be closed so we stop propagation
* of the click event inside the dropdown.
*
* Since this component is rendered multiple times per page we need to guarantee we only
* target the click event of this component.
*/
stopDropdownClickPropagation() {
$(
'.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
this.$el,
).on('click', e => {
e.stopPropagation();
});
},
pipelineActionRequestComplete() { pipelineActionRequestComplete() {
this.$emit('pipelineActionRequestComplete'); this.$emit('pipelineActionRequestComplete');
}, },
......
...@@ -135,6 +135,7 @@ export default { ...@@ -135,6 +135,7 @@ export default {
:class="jobClasses" :class="jobClasses"
class="js-pipeline-graph-job-link qa-job-link menu-item" class="js-pipeline-graph-job-link qa-job-link menu-item"
data-testid="job-with-link" data-testid="job-with-link"
@click.stop
> >
<job-name-component :name="job.name" :status="job.status" /> <job-name-component :name="job.name" :status="job.status" />
</gl-link> </gl-link>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment