Skip to content

Commit 2850813

Browse files
Merge pull request #37462 from nextcloud/backport/37423/stable25
[stable25] Replace custom tooltips with native ones of entries in contacts menu.
2 parents dd2b88c + ef97df2 commit 2850813

6 files changed

Lines changed: 8 additions & 13 deletions

File tree

core/src/OC/contactsmenu.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,6 @@ const ContactsListItemView = View.extend({
178178
// Show placeholder if no avatar is available (avatar is rendered as img, not div)
179179
this.$('div.avatar').imageplaceholder(this._model.get('fullName'))
180180

181-
// Show tooltip for top action
182-
this.$('.top-action').tooltip({ placement: 'left' })
183-
// Show tooltip for second action
184-
this.$('.second-action').tooltip({ placement: 'left' })
185-
186181
return this
187182
},
188183

core/src/OC/contactsmenu/contact.handlebars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</a>
2929
{{/if}}
3030
{{#if contact.topAction}}
31-
<a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}">
31+
<a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}" aria-label="{{contact.topAction.title}}">
3232
<img src="{{contact.topAction.icon}}" alt="{{contact.topAction.title}}">
3333
</a>
3434
{{/if}}
@@ -49,7 +49,7 @@
4949
</div>
5050
{{/if}}
5151
{{#if contact.hasTwoActions}}
52-
<a class="second-action" href="{{contact.secondAction.hyperlink}}" title="{{contact.secondAction.title}}">
52+
<a class="second-action" href="{{contact.secondAction.hyperlink}}" aria-label="{{contact.secondAction.title}}" title="{{contact.secondAction.title}}">
5353
<img src="{{contact.secondAction.icon}}" alt="{{contact.secondAction.title}}">
5454
</a>
5555
{{/if}}

dist/core-login.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)