Skip to content

Commit

Permalink
Merge pull request #37423 from nextcloud/fix/37422-Remove_custom_tool…
Browse files Browse the repository at this point in the history
…tips_from_entries_of_contacts_menu

Replace custom tooltips with native ones of entries in contacts menu.
  • Loading branch information
JuliaKirschenheuter authored Mar 29, 2023
2 parents b129cea + ccf9297 commit 31f4f41
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 13 deletions.
5 changes: 0 additions & 5 deletions core/src/OC/contactsmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,6 @@ const ContactsListItemView = View.extend({
// Show placeholder if no avatar is available (avatar is rendered as img, not div)
this.$('div.avatar').imageplaceholder(this._model.get('fullName'))

// Show tooltip for top action
this.$('.top-action').tooltip({ placement: 'left' })
// Show tooltip for second action
this.$('.second-action').tooltip({ placement: 'left' })

return this
},

Expand Down
4 changes: 2 additions & 2 deletions core/src/OC/contactsmenu/contact.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</a>
{{/if}}
{{#if contact.topAction}}
<a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}">
<a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}" aria-label="{{contact.topAction.title}}">
<img src="{{contact.topAction.icon}}" alt="{{contact.topAction.title}}">
</a>
{{/if}}
Expand All @@ -49,7 +49,7 @@
</div>
{{/if}}
{{#if contact.hasTwoActions}}
<a class="second-action" href="{{contact.secondAction.hyperlink}}" title="{{contact.secondAction.title}}">
<a class="second-action" href="{{contact.secondAction.hyperlink}}" aria-label="{{contact.secondAction.title}}" title="{{contact.secondAction.title}}">
<img src="{{contact.secondAction.icon}}" alt="{{contact.secondAction.title}}">
</a>
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions dist/core-login.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

0 comments on commit 31f4f41

Please sign in to comment.