Skip to content

[stable28] Fix migration from v-tooltip to native title in menu bar buttons ActionEntry #5236

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.

Sign up for GitHub

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

Merged
ShGKme merged 2 commits into from
Jan 12, 2024
Merged

[stable28] Fix migration from v-tooltip to native title in menu bar buttons ActionEntry #5236

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2788dfd
fix: migrate from v-tooltip to native title in ActionSingle
ShGKme Jan 11, 2024
ffd8e44
fix: remove duplicating `t` method registration
ShGKme Jan 11, 2024
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
Next Next commit
fix: migrate from v-tooltip to native title in ActionSingle 
- Remove usage of already deleted directive v-tooltip
- Fixed native title text to be the same as was used in tooltip to show shortcuts on desktop

Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
@ShGKme @backportbot-nextcloud
ShGKme authored and backportbot-nextcloud[bot] committed Jan 12, 2024
commit 2788dfd6100337af5cb30faeb8651f12c93b6e50
11 changes: 1 addition & 10 deletions src/components/Menu/ActionSingle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,26 +104,17 @@ export default {

const { class: classes, ...attrs } = bindState

// do not use tooltip if is a item of action list
const directives = isItem
? []
: [{
name: 'tooltip',
value: tooltip,
}]

const children = [h(icon, { slot: 'icon' })]

// do not use title if is a item of action list
const title = isItem ? undefined : label
const title = isItem ? undefined : tooltip

if (isItem || actionEntry.forceLabel) {
// add label
children.push(label)
}

return h(component, {
directives,
staticClass: 'entry-single-action entry-action',
class: classes,
attrs: {
Expand Down