Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable30] fix: replace v-tooltip with native title #13444

Merged
merged 2 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/components/AdminSettings/TurnServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
@input="updateSchemes" />

<NcTextField ref="turn_server"
v-tooltip.auto="turnServerError"
name="turn_server"
placeholder="turnserver:port"
class="turn-server__textfield"
:class="{ error: turnServerError }"
:title="turnServerError"
:value="server"
:disabled="loading"
:label="t('spreed', 'TURN server URL')"
Expand Down Expand Up @@ -92,17 +92,12 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import { isCertificateValid } from '../../services/certificateService.js'

export default {
name: 'TurnServer',

directives: {
Tooltip,
},

components: {
AlertCircle,
Check,
Expand Down
11 changes: 3 additions & 8 deletions src/components/AdminSettings/WebServerSetupChecks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<ul class="web-server-setup-checks">
<li class="virtual-background">
{{ t('spreed', 'Files required for virtual background can be loaded') }}
<NcButton v-tooltip="virtualBackgroundAvailableToolTip"
type="tertiary"
<NcButton type="tertiary"
class="vue-button-inline"
:class="{'success-button': virtualBackgroundAvailable === true, 'error-button': virtualBackgroundAvailable === false}"
:title="virtualBackgroundAvailableTitle"
:aria-label="virtualBackgroundAvailableAriaLabel"
@click="checkVirtualBackground">
<template #icon>
Expand All @@ -41,7 +41,6 @@ import { generateFilePath } from '@nextcloud/router'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import { VIRTUAL_BACKGROUND } from '../../constants.js'
import JitsiStreamBackgroundEffect from '../../utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js'
Expand All @@ -50,10 +49,6 @@ import VirtualBackground from '../../utils/media/pipeline/VirtualBackground.js'
export default {
name: 'WebServerSetupChecks',

directives: {
Tooltip,
},

components: {
AlertCircle,
NcButton,
Expand Down Expand Up @@ -85,7 +80,7 @@ export default {
return t('spreed', 'Checking …')
},

virtualBackgroundAvailableToolTip() {
virtualBackgroundAvailableTitle() {
if (this.virtualBackgroundAvailable === false && !VirtualBackground.isWasmSupported()) {
return t('spreed', 'Failed: WebAssembly is disabled or not supported in this browser. Please enable WebAssembly or use a browser with support for it to do the check.')
}
Expand Down
5 changes: 3 additions & 2 deletions src/components/CallView/Grid/Grid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<NcButton v-if="isStripe && !isRecording"
class="stripe--collapse"
type="tertiary-no-background"
:aria-label="stripeButtonTooltip"
:title="stripeButtonTitle"
:aria-label="stripeButtonTitle"
@click="handleClickStripeCollapse">
<template #icon>
<ChevronDown v-if="stripeOpen"
Expand Down Expand Up @@ -274,7 +275,7 @@ export default {
},

computed: {
stripeButtonTooltip() {
stripeButtonTitle() {
if (this.stripeOpen) {
return t('spreed', 'Collapse stripe')
} else {
Expand Down
29 changes: 6 additions & 23 deletions src/components/CallView/shared/LocalAudioControlButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<NcButton v-tooltip="audioButtonTooltip"
<NcButton :title="audioButtonTitle"
:type="type"
:aria-label="audioButtonAriaLabel"
:class="{ 'no-audio-available': !model.attributes.audioAvailable }"
Expand All @@ -26,7 +26,6 @@ import { t } from '@nextcloud/l10n'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import VolumeIndicator from '../../UIShared/VolumeIndicator.vue'

Expand All @@ -41,10 +40,6 @@ export default {
VolumeIndicator,
},

directives: {
Tooltip,
},

props: {
conversation: {
type: Object,
Expand Down Expand Up @@ -81,40 +76,28 @@ export default {
return this.model.attributes.audioAvailable && this.model.attributes.audioEnabled
},

audioButtonTooltip() {
audioButtonTitle() {
if (!this.isAudioAllowed) {
return t('spreed', 'You are not allowed to enable audio')
}

if (!this.model.attributes.audioAvailable) {
return {
content: t('spreed', 'No audio. Click to select device'),
show: false,
}
return t('spreed', 'No audio. Click to select device')
}

if (this.speakingWhileMutedNotification && !this.screenSharingMenuOpen) {
return {
content: this.speakingWhileMutedNotification,
show: true,
}
return this.speakingWhileMutedNotification
}

let content = ''
if (this.model.attributes.audioEnabled) {
content = this.disableKeyboardShortcuts
return this.disableKeyboardShortcuts
? t('spreed', 'Mute audio')
: t('spreed', 'Mute audio (M)')
} else {
content = this.disableKeyboardShortcuts
return this.disableKeyboardShortcuts
? t('spreed', 'Unmute audio')
: t('spreed', 'Unmute audio (M)')
}

return {
content,
show: false,
}
},

audioButtonAriaLabel() {
Expand Down
9 changes: 2 additions & 7 deletions src/components/CallView/shared/LocalVideoControlButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<NcButton v-tooltip="videoButtonTooltip"
<NcButton :title="videoButtonTitle"
:type="type"
:aria-label="videoButtonAriaLabel"
:class="{ 'no-video-available': !model.attributes.videoAvailable }"
Expand All @@ -26,7 +26,6 @@ import { t } from '@nextcloud/l10n'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import { PARTICIPANT } from '../../../constants.js'
import BrowserStorage from '../../../services/BrowserStorage.js'
Expand All @@ -40,10 +39,6 @@ export default {
VideoOff,
},

directives: {
Tooltip,
},

props: {
conversation: {
type: Object,
Expand Down Expand Up @@ -80,7 +75,7 @@ export default {
return this.model.attributes.videoAvailable && this.model.attributes.videoEnabled
},

videoButtonTooltip() {
videoButtonTitle() {
if (!this.isVideoAllowed) {
return t('spreed', 'You are not allowed to enable video')
}
Expand Down
19 changes: 7 additions & 12 deletions src/components/CallView/shared/VideoBottomBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
group>
<NcButton v-if="showAudioIndicator"
key="audioIndicator"
v-tooltip="audioButtonTooltip"
:aria-label="audioButtonTooltip"
:title="audioButtonTitle"
:aria-label="audioButtonTitle"
class="audioIndicator"
type="tertiary-no-background"
:disabled="isAudioButtonDisabled"
Expand All @@ -47,8 +47,8 @@

<NcButton v-if="showVideoIndicator"
key="videoIndicator"
v-tooltip="videoButtonTooltip"
:aria-label="videoButtonTooltip"
:title="videoButtonTitle"
:aria-label="videoButtonTitle"
class="videoIndicator"
type="tertiary-no-background"
@click.stop="toggleVideo">
Expand All @@ -60,7 +60,7 @@

<NcButton v-if="showScreenSharingIndicator"
key="screenSharingIndicator"
v-tooltip="t('spreed', 'Show screen')"
:title="t('spreed', 'Show screen')"
:aria-label="t('spreed', 'Show screen')"
class="screenSharingIndicator"
:class="{'screen-visible': sharedData.screenVisible}"
Expand Down Expand Up @@ -101,7 +101,6 @@ import { emit } from '@nextcloud/event-bus'
import { t } from '@nextcloud/l10n'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import TransitionWrapper from '../../UIShared/TransitionWrapper.vue'

Expand All @@ -123,10 +122,6 @@ export default {
VideoOff,
},

directives: {
Tooltip,
},

inheritAttrs: false,

props: {
Expand Down Expand Up @@ -210,7 +205,7 @@ export default {
isAudioButtonDisabled() {
return !this.model.attributes.audioAvailable || !this.canFullModerate
},
audioButtonTooltip() {
audioButtonTitle() {
return this.model.attributes.audioAvailable
? t('spreed', 'Mute')
: t('spreed', 'Muted')
Expand All @@ -226,7 +221,7 @@ export default {
isRemoteVideoBlocked() {
return this.sharedData.remoteVideoBlocker && !this.sharedData.remoteVideoBlocker.isVideoEnabled()
},
videoButtonTooltip() {
videoButtonTitle() {
return this.isRemoteVideoEnabled
? t('spreed', 'Disable video')
: t('spreed', 'Enable video')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
({{ processStateText }})
</NcCheckboxRadioSwitch>
<NcButton v-if="enabled"
v-tooltip.top="{ content: t('spreed', 'Show Matterbridge log') }"
type="tertiary"
:title="t('spreed', 'Show Matterbridge log')"
:aria-label="t('spreed', 'Show Matterbridge log')"
@click="showLogContent">
<template #icon>
Expand Down Expand Up @@ -94,7 +94,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadi
import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import NcTextArea from '@nextcloud/vue/dist/Components/NcTextArea.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import BridgePart from './BridgePart.vue'

Expand All @@ -119,10 +118,6 @@ export default {
Plus,
},

directives: {
Tooltip,
},

setup() {
return {
sidebarStore: useSidebarStore(),
Expand Down
21 changes: 8 additions & 13 deletions src/components/MediaSettings/MediaSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<!-- Audio and video toggles -->
<div class="media-settings__toggles">
<!-- Audio toggle -->
<NcButton v-tooltip="audioButtonTooltip"
type="tertiary"
:aria-label="audioButtonTooltip"
<NcButton type="tertiary"
:title="audioButtonTitle"
:aria-label="audioButtonTitle"
:disabled="!audioPreviewAvailable"
@click="toggleAudio">
<template #icon>
Expand All @@ -59,9 +59,9 @@
</NcButton>

<!-- Video toggle -->
<NcButton v-tooltip="videoButtonTooltip"
type="tertiary"
:aria-label="videoButtonTooltip"
<NcButton type="tertiary"
:title="videoButtonTitle"
:aria-label="videoButtonTitle"
:disabled="!videoPreviewAvailable"
@click="toggleVideo">
<template #icon>
Expand Down Expand Up @@ -193,7 +193,6 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import MediaDevicesSelector from './MediaDevicesSelector.vue'
import MediaDevicesSpeakerTest from './MediaDevicesSpeakerTest.vue'
Expand All @@ -217,10 +216,6 @@ import { localMediaModel } from '../../utils/webrtc/index.js'
export default {
name: 'MediaSettings',

directives: {
Tooltip,
},

components: {
AvatarWrapper,
Bell,
Expand Down Expand Up @@ -361,14 +356,14 @@ export default {
return this.videoPreviewAvailable && this.videoOn
},

audioButtonTooltip() {
audioButtonTitle() {
if (!this.audioPreviewAvailable) {
return t('spreed', 'No audio')
}
return this.audioOn ? t('spreed', 'Mute audio') : t('spreed', 'Unmute audio')
},

videoButtonTooltip() {
videoButtonTitle() {
if (!this.videoPreviewAvailable) {
return t('spreed', 'No camera')
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,9 @@ export default {
readInfo() {
return {
showCommonReadIcon: this.showCommonReadIcon,
commonReadIconTooltip: t('spreed', 'Message read by everyone who shares their reading status'),
commonReadIconTitle: t('spreed', 'Message read by everyone who shares their reading status'),
showSentIcon: this.showSentIcon,
sentIconTooltip: t('spreed', 'Message sent'),
sentIconTitle: t('spreed', 'Message sent'),
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ describe('MessageButtonsBar.vue', () => {
readInfo: {
showCommonReadIcon: true,
showSentIcon: true,
commonReadIconTooltip: '',
sentIconTooltip: '',
commonReadIconTitle: '',
sentIconTitle: '',
},
isTranslationAvailable: false,
}
Expand Down
Loading
Loading