diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-10-27 12:50:58 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-10-27 12:50:58 +0000 |
commit | ab9b54f977b921267f7703f170216fb3594d00a5 (patch) | |
tree | ccc4d1f5ed222b96f0190f846ec5267ddd6ee357 /app | |
parent | 172ebcb8bb9c0b4d3c565560880fc604cae02b5e (diff) | |
parent | 4e8010aa9d8bdb05c3999691731daa2e8e99c9d8 (diff) | |
download | gitlab-ce-ab9b54f977b921267f7703f170216fb3594d00a5.tar.gz |
Merge branch 'add-user-avatar-username-link' into 'master'
Add configurable option to display username in user avatar link component
See merge request gitlab-org/gitlab-ce!14902
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue index 95898d54cf7..dc32e783258 100644 --- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue +++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue @@ -12,12 +12,14 @@ :img-alt="tooltipText" :img-size="20" :tooltip-text="tooltipText" - tooltip-placement="top" + :tooltip-placement="top" + :username="username" /> */ import userAvatarImage from './user_avatar_image.vue'; +import tooltip from '../../directives/tooltip'; export default { name: 'UserAvatarLink', @@ -60,6 +62,22 @@ export default { required: false, default: 'top', }, + username: { + type: String, + required: false, + default: '', + }, + }, + computed: { + shouldShowUsername() { + return this.username.length > 0; + }, + avatarTooltipText() { + return this.shouldShowUsername ? '' : this.tooltipText; + }, + }, + directives: { + tooltip, }, }; </script> @@ -73,8 +91,13 @@ export default { :img-alt="imgAlt" :css-classes="imgCssClasses" :size="imgSize" - :tooltip-text="tooltipText" + :tooltip-text="avatarTooltipText" + :tooltip-placement="tooltipPlacement" + /><span + v-if="shouldShowUsername" + v-tooltip + :title="tooltipText" :tooltip-placement="tooltipPlacement" - /> + >{{username}}</span> </a> </template> |