Skip to content

Commit

Permalink
Merge pull request #5236 from nextcloud/backport/5233/stable28
Browse files Browse the repository at this point in the history
[stable28] Fix migration from `v-tooltip` to native `title` in menu bar buttons `ActionEntry`
  • Loading branch information
ShGKme authored Jan 12, 2024
2 parents 5de1df7 + ffd8e44 commit c05a03b
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 15 deletions.
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

0 comments on commit c05a03b

Please sign in to comment.