diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-28 09:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 09:38:35 +0200 |
| commit | 3fb7de2dfb5099e4acb4f19b3038fb7acb5321c1 (patch) | |
| tree | 5d09c833cc10cae2d2bcba1f743dcc9c3a8f9112 /core | |
| parent | 9da697b11af2928a1470dcedc7ebf77e4a5f0730 (diff) | |
| parent | 9c4275a832b46f37aeb4cd0424a0a315718b5e3d (diff) | |
| download | nextcloud-server-3fb7de2dfb5099e4acb4f19b3038fb7acb5321c1.tar.gz nextcloud-server-3fb7de2dfb5099e4acb4f19b3038fb7acb5321c1.zip | |
Merge pull request #4562 from nextcloud/contactmenu-second-tooltip
Show tooltip for second action in contacts menu
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/contactsmenu.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/contactsmenu.js b/core/js/contactsmenu.js index 15c48887d20..9ce27509e8b 100644 --- a/core/js/contactsmenu.js +++ b/core/js/contactsmenu.js @@ -64,7 +64,7 @@ + '</a>' + '{{/if}}' + '{{#if contact.hasTwoActions}}' - + '<a class="second-action" href="{{contact.secondAction.hyperlink}}">' + + '<a class="second-action" href="{{contact.secondAction.hyperlink}}" title="{{contact.secondAction.title}}">' + ' <img src="{{contact.secondAction.icon}}">' + '</a>' + '{{/if}}' @@ -228,6 +228,8 @@ // Show tooltip for top action this.$('.top-action').tooltip({placement: 'left'}); + // Show tooltip for second action + this.$('.second-action').tooltip({placement: 'left'}); return this; }, |