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

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

Merged
merged 2 commits into from
Jan 12, 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
11 changes: 1 addition & 10 deletions src/components/Menu/ActionSingle.vue
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
2 changes: 2 additions & 0 deletions src/components/Suggestion/SuggestionListWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
</div>
</template>
<script>
import { translate as t } from '@nextcloud/l10n'

export default {
name: 'SuggestionListWrapper',

Expand Down
1 change: 0 additions & 1 deletion src/nodes/Table/TableCellView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export default {
},
},
computed: {
t: () => window.t,
textAlign() {
return { 'text-align': this.node.attrs.textAlign }
},
Expand Down
1 change: 0 additions & 1 deletion src/nodes/Table/TableHeaderView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export default {
},
},
computed: {
t: () => window.t,
textAlign() {
return { 'text-align': this.node.attrs.textAlign }
},
Expand Down
3 changes: 0 additions & 3 deletions src/nodes/Table/TableView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ export default {
required: true,
},
},
computed: {
t: () => window.t,
},
}
</script>

Expand Down
Loading