Commit 160d96a5 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '328075-create-eslint-rule-forbidding-data-toggle-dropdown-within-vue-components' into 'master'

Resolve "Create eslint rule forbidding data-toggle="dropdown" within Vue components"

See merge request gitlab-org/gitlab!60069
parents 9657232c 20cf7fa0
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
</div> </div>
<div class="flex-grow align-self-center text-center"> <div class="flex-grow align-self-center text-center">
<div class="js-ca-dropdown dropdown inline"> <div class="js-ca-dropdown dropdown inline">
<!-- eslint-disable-next-line @gitlab/vue-no-data-toggle -->
<button class="dropdown-menu-toggle" data-toggle="dropdown" type="button"> <button class="dropdown-menu-toggle" data-toggle="dropdown" type="button">
<span class="dropdown-label"> <span class="dropdown-label">
<gl-sprintf :message="$options.i18n.dropdownText"> <gl-sprintf :message="$options.i18n.dropdownText">
......
...@@ -53,6 +53,7 @@ export default { ...@@ -53,6 +53,7 @@ export default {
</script> </script>
<template> <template>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<div class="dropdown js-issuable-selector-wrap" data-issuable-type="issues"> <div class="dropdown js-issuable-selector-wrap" data-issuable-type="issues">
<button <button
ref="toggle" ref="toggle"
......
...@@ -354,6 +354,7 @@ export default { ...@@ -354,6 +354,7 @@ export default {
@click="onDelete" @click="onDelete"
/> />
<div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions"> <div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions">
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<gl-button <gl-button
v-gl-tooltip v-gl-tooltip
:title="$options.i18n.moreActionsLabel" :title="$options.i18n.moreActionsLabel"
...@@ -365,6 +366,7 @@ export default { ...@@ -365,6 +366,7 @@ export default {
data-toggle="dropdown" data-toggle="dropdown"
@click="closeTooltip" @click="closeTooltip"
/> />
<!-- eslint-enable @gitlab/vue-no-data-toggle -->
<ul class="dropdown-menu more-actions-dropdown dropdown-open-left"> <ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
<gl-dropdown-item v-if="canReportAsAbuse" :href="reportAbusePath"> <gl-dropdown-item v-if="canReportAsAbuse" :href="reportAbusePath">
{{ __('Report abuse to admin') }} {{ __('Report abuse to admin') }}
......
...@@ -53,6 +53,7 @@ export default { ...@@ -53,6 +53,7 @@ export default {
}; };
</script> </script>
<template> <template>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<div :id="computedJobId" class="ci-job-dropdown-container dropdown dropright"> <div :id="computedJobId" class="ci-job-dropdown-container dropdown dropright">
<button <button
type="button" type="button"
......
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
</script> </script>
<template> <template>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<button <button
:disabled="isDisabled || isLoading" :disabled="isDisabled || isLoading"
class="dropdown-menu-toggle dropdown-menu-full-width" class="dropdown-menu-toggle dropdown-menu-full-width"
......
...@@ -61,6 +61,7 @@ export default { ...@@ -61,6 +61,7 @@ export default {
</script> </script>
<template> <template>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<button <button
ref="dropdownButton" ref="dropdownButton"
:class="{ 'js-extra-options': showExtraOptions }" :class="{ 'js-extra-options': showExtraOptions }"
......
...@@ -137,6 +137,7 @@ export default { ...@@ -137,6 +137,7 @@ export default {
data-testid="more-actions-toggle" data-testid="more-actions-toggle"
> >
<template #button-content> <template #button-content>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<span <span
v-gl-tooltip v-gl-tooltip
category="tertiary" category="tertiary"
...@@ -145,6 +146,7 @@ export default { ...@@ -145,6 +146,7 @@ export default {
> >
<gl-icon name="ellipsis_v" /> <gl-icon name="ellipsis_v" />
</span> </span>
<!-- eslint-enable @gitlab/vue-no-data-toggle -->
</template> </template>
<template v-if="isDefaultStage"> <template v-if="isDefaultStage">
<gl-dropdown-item <gl-dropdown-item
......
...@@ -121,6 +121,7 @@ export default { ...@@ -121,6 +121,7 @@ export default {
<div class="selectbox" style="display: none"> <div class="selectbox" style="display: none">
<div class="dropdown"> <div class="dropdown">
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<button <button
ref="dropdown" ref="dropdown"
:data-field-name="fieldName" :data-field-name="fieldName"
...@@ -141,6 +142,8 @@ export default { ...@@ -141,6 +142,8 @@ export default {
:size="16" :size="16"
/> />
</button> </button>
<!-- eslint-enable @gitlab/vue-no-data-toggle -->
<div <div
class="dropdown-menu dropdown-select dropdown-menu-paging dropdown-menu-user dropdown-menu-selectable dropdown-menu-author" class="dropdown-menu dropdown-select dropdown-menu-paging dropdown-menu-user dropdown-menu-selectable dropdown-menu-author"
> >
......
...@@ -89,6 +89,7 @@ export default { ...@@ -89,6 +89,7 @@ export default {
<div class="selectbox" style="display: none"> <div class="selectbox" style="display: none">
<input :value="milestoneId" name="milestone_id" type="hidden" /> <input :value="milestoneId" name="milestone_id" type="hidden" />
<div class="dropdown"> <div class="dropdown">
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<button <button
ref="dropdownButton" ref="dropdownButton"
:data-selected="selected" :data-selected="selected"
...@@ -110,6 +111,8 @@ export default { ...@@ -110,6 +111,8 @@ export default {
:size="16" :size="16"
/> />
</button> </button>
<!-- eslint-enable @gitlab/vue-no-data-toggle -->
<div class="dropdown-menu dropdown-select dropdown-menu-selectable"> <div class="dropdown-menu dropdown-select dropdown-menu-selectable">
<div class="dropdown-input"> <div class="dropdown-input">
<input <input
......
...@@ -102,6 +102,8 @@ export default { ...@@ -102,6 +102,8 @@ export default {
{{ $options[$options.LICENSE_APPROVAL_ACTION.DENY] }} {{ $options[$options.LICENSE_APPROVAL_ACTION.DENY] }}
</gl-dropdown-item> </gl-dropdown-item>
</gl-dropdown> </gl-dropdown>
<!-- eslint-disable @gitlab/vue-no-data-toggle -->
<gl-button <gl-button
v-gl-tooltip v-gl-tooltip
v-gl-modal.modal-license-delete-confirmation v-gl-modal.modal-license-delete-confirmation
...@@ -114,6 +116,7 @@ export default { ...@@ -114,6 +116,7 @@ export default {
data-toggle="modal" data-toggle="modal"
@click="setLicenseInModal(license)" @click="setLicenseInModal(license)"
/> />
<!-- eslint-enable @gitlab/vue-no-data-toggle -->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -867,10 +867,10 @@ ...@@ -867,10 +867,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e" resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg== integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
"@gitlab/eslint-plugin@8.2.0": "@gitlab/eslint-plugin@8.3.0":
version "8.2.0" version "8.3.0"
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.2.0.tgz#caccf2777febd89420c0225e000a789376ecaba2" resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.3.0.tgz#156a375c6ab9e578ba39080932bca27006413486"
integrity sha512-14VJEOmAx8MpsxlYdloWD9KG9+AVX8HLKWAo2M5cz57Ji6AiJtdCAfFCrVetcvzDyeiFA7gt4k1fSKbTjuVgBQ== integrity sha512-AuJ6ddKVbfjVUd9DLaNLhpflThZKULWatpUuI+0RhcqyRTmcb1KL5YPxxKDlE1K+faeefgiWaGB+vSNmyNNPQQ==
dependencies: dependencies:
babel-eslint "^10.0.3" babel-eslint "^10.0.3"
eslint-config-airbnb-base "^14.2.1" eslint-config-airbnb-base "^14.2.1"
......
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