Commit 234031c6 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch '229038-delete-environment-tooltip' into 'master'

Remove jquery tooltip API call from delete environment button

See merge request gitlab-org/gitlab!44191
parents 2dea844d 949dac07
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Used in the environments table and the environment detail view. * Used in the environments table and the environment detail view.
*/ */
import $ from 'jquery';
import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlIcon } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
...@@ -42,7 +41,7 @@ export default { ...@@ -42,7 +41,7 @@ export default {
}, },
methods: { methods: {
onClick() { onClick() {
$(this.$el).tooltip('dispose'); this.$root.$emit('bv::hide::tooltip', this.$options.deleteEnvironmentTooltipId);
eventHub.$emit('requestDeleteEnvironment', this.environment); eventHub.$emit('requestDeleteEnvironment', this.environment);
}, },
onDeleteEnvironment(environment) { onDeleteEnvironment(environment) {
...@@ -51,11 +50,12 @@ export default { ...@@ -51,11 +50,12 @@ export default {
} }
}, },
}, },
deleteEnvironmentTooltipId: 'delete-environment-button-tooltip',
}; };
</script> </script>
<template> <template>
<loading-button <loading-button
v-gl-tooltip v-gl-tooltip="{ id: $options.deleteEnvironmentTooltipId }"
:loading="isLoading" :loading="isLoading"
:title="title" :title="title"
:aria-label="title" :aria-label="title"
......
---
title: Remove jquery tooltip API call from delete environment button
merge_request: 44191
author:
type: other
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