diff options
author | julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> | 2022-12-28 11:32:42 +0100 |
---|---|---|
committer | julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> | 2023-01-11 14:22:47 +0100 |
commit | 087f445499ec5a1d4eae246941f0e155420685fb (patch) | |
tree | 42611b49f2fa81df2830018f939bb526769cbed0 /apps/settings | |
parent | 9bddc38f196bdf28142a0cd7afce4505672d8fa2 (diff) | |
download | nextcloud-server-087f445499ec5a1d4eae246941f0e155420685fb.tar.gz nextcloud-server-087f445499ec5a1d4eae246941f0e155420685fb.zip |
Replace custom tooltips with native tooltips
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Diffstat (limited to 'apps/settings')
5 files changed, 15 insertions, 27 deletions
diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue index 93ccf253ac5..f4cae83f167 100644 --- a/apps/settings/src/components/AppDetails.vue +++ b/apps/settings/src/components/AppDetails.vue @@ -72,14 +72,16 @@ :disabled="installing || isLoading" @click="disable(app.id)"> <input v-if="!app.active && (app.canInstall || app.isCompatible)" - v-tooltip.auto="enableButtonTooltip" + :title="enableButtonTooltip" + :aria-label="enableButtonTooltip" class="enable primary" type="button" :value="enableButtonText" :disabled="!app.canInstall || installing || isLoading" @click="enable(app.id)"> <input v-else-if="!app.active && !app.canInstall" - v-tooltip.auto="forceEnableButtonTooltip" + :title="forceEnableButtonTooltip" + :aria-label="forceEnableButtonTooltip" class="enable force" type="button" :value="forceEnableButtonText" diff --git a/apps/settings/src/components/AuthToken.vue b/apps/settings/src/components/AuthToken.vue index 38aafc9e8d6..d7ed81a35ab 100644 --- a/apps/settings/src/components/AuthToken.vue +++ b/apps/settings/src/components/AuthToken.vue @@ -37,14 +37,12 @@ <span v-if="wiping" class="wiping-warning">({{ t('settings', 'Marked for remote wipe') }})</span> </td> <td> - <span v-tooltip="lastActivity" class="last-activity">{{ lastActivityRelative }}</span> + <span :title="lastActivity" class="last-activity">{{ lastActivityRelative }}</span> </td> <td class="more"> <NcActions v-if="!token.current" - v-tooltip.auto="{ - content: t('settings', 'Device settings'), - container: 'body' - }" + :title="t('settings', 'Device settings')" + :aria-label="t('settings', 'Device settings')" :open.sync="actionOpen"> <NcActionCheckbox v-if="token.type === 1" :checked="token.scope.filesystem" diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue index 3eae5b389b9..09b44a8b96c 100644 --- a/apps/settings/src/components/AuthTokenSetupDialogue.vue +++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue @@ -55,8 +55,10 @@ class="monospaced" readonly="readonly" @focus="selectInput"> + <a ref="clipboardButton" - v-tooltip="copyTooltipOptions" + :title="copyTooltipOptions" + :aria-label="copyTooltipOptions" v-clipboard:copy="appPassword" v-clipboard:success="onCopyPassword" v-clipboard:error="onCopyPasswordFailed" @@ -113,24 +115,10 @@ export default { }, computed: { copyTooltipOptions() { - const base = { - hideOnTargetClick: false, - trigger: 'manual', - } - if (this.passwordCopied) { - return { - ...base, - content: t('settings', 'Copied!'), - show: true, - } - } else { - return { - ...base, - content: t('settings', 'Copy'), - show: this.hoveringCopyButton, - } + return t('settings', 'Copied!') } + return t('settings', 'Copy') }, }, methods: { diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue index ea22ddf873f..ae1392fe580 100644 --- a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue +++ b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue @@ -34,7 +34,8 @@ :is-supported-scope="supportedScopes.includes(federationScope.name)" :name="federationScope.name" :tooltip-disabled="federationScope.tooltipDisabled" - :tooltip="federationScope.tooltip" /> + :tooltip="federationScope.tooltip" + :aria-label="federationScope.tooltip" /> </NcActions> </template> diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue index 22ce295db1d..591aab76710 100644 --- a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue +++ b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue @@ -27,9 +27,8 @@ :close-after-click="true" :disabled="!isSupportedScope" :icon="iconClass" - :title="displayName" + :title="isSupportedScope ? tooltip : tooltipDisabled" @click.stop.prevent="updateScope"> - {{ isSupportedScope ? tooltip : tooltipDisabled }} </NcActionButton> </template> |