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

Replace custom tooltips with native tooltips in personal and administration settings #35901

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: 2 additions & 5 deletions apps/federatedfilesharing/src/components/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{{ t('federatedfilesharing', 'Your Federated Cloud ID:') }}
<strong id="cloudid">{{ cloudId }}</strong>
<NcButton ref="clipboard"
v-tooltip="copyLinkTooltip"
:title="copyLinkTooltip"
:aria-label="copyLinkTooltip"
class="clipboard"
type="tertiary-no-background"
@click.prevent="copyCloudId">
Expand Down Expand Up @@ -94,7 +95,6 @@ import Twitter from 'vue-material-design-icons/Twitter'
import Facebook from 'vue-material-design-icons/Facebook'
import Web from 'vue-material-design-icons/Web'
import Clipboard from 'vue-material-design-icons/Clipboard'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'

export default {
name: 'PersonalSettings',
Expand All @@ -106,9 +106,6 @@ export default {
Web,
Clipboard,
},
directives: {
Tooltip,
},
data() {
return {
color: loadState('federatedfilesharing', 'color'),
Expand Down
6 changes: 4 additions & 2 deletions apps/settings/src/components/AppDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 3 additions & 5 deletions apps/settings/src/components/AuthToken.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 5 additions & 17 deletions apps/settings/src/components/AuthTokenSetupDialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 2 additions & 5 deletions apps/theming/src/components/BackgroundSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
<!-- Background set selection -->
<button v-for="shippedBackground in shippedBackgrounds"
:key="shippedBackground.name"
v-tooltip="shippedBackground.details.attribution"
:title="shippedBackground.details.attribution"
:aria-label="shippedBackground.details.attribution"
:class="{ 'icon-loading': loading === shippedBackground.name, 'background--active': backgroundImage === shippedBackground.name }"
:data-color-bright="shippedBackground.details.theming === 'dark'"
:data-user-theming-background-shipped="shippedBackground.name"
Expand Down Expand Up @@ -93,7 +94,6 @@ import Check from 'vue-material-design-icons/Check.vue'
import Close from 'vue-material-design-icons/Close.vue'
import debounce from 'debounce'
import NcColorPicker from '@nextcloud/vue/dist/Components/NcColorPicker'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Vibrant from 'node-vibrant'
import { Palette } from 'node-vibrant/lib/color'
import { getFilePickerBuilder } from '@nextcloud/dialogs'
Expand All @@ -114,9 +114,6 @@ const picker = getFilePickerBuilder(t('theming', 'Select a background from your

export default {
name: 'BackgroundSettings',
directives: {
Tooltip,
},

components: {
Check,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</template>
<template v-else>
{{ t('updatenotification', 'Your version is up to date.') }}
<span v-tooltip.auto="lastCheckedOnString" class="icon-info svg" />
<span :title="lastCheckedOnString" :aria-label="lastCheckedOnString" class="icon-info svg" />
</template>

<template v-if="!isDefaultUpdateServerURL">
Expand Down Expand Up @@ -129,7 +129,6 @@ import NcPopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu.js'
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
import { VTooltip } from 'v-tooltip'
import ClickOutside from 'vue-click-outside'
import axios from '@nextcloud/axios'
import { loadState } from '@nextcloud/initial-state'
Expand All @@ -142,8 +141,6 @@ const logger = getLoggerBuilder()
.detectUser()
.build()

VTooltip.options.defaultHtml = false

export default {
name: 'UpdateNotification',
components: {
Expand All @@ -154,7 +151,6 @@ export default {
},
directives: {
ClickOutside,
tooltip: VTooltip,
},
data() {
return {
Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/federatedfilesharing-vue-settings-personal.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/federatedfilesharing-vue-settings-personal.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-apps-view-7418.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-apps-view-7418.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-info.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-security.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-security.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/theming-personal-theming.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/theming-personal-theming.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/updatenotification-updatenotification.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/updatenotification-updatenotification.js.map

Large diffs are not rendered by default.