Commit 4ae71a90 authored by Bryce Johnson's avatar Bryce Johnson

Fix avatarSizeClass error and nonUser -> clickable.

parent e68a7f3c
......@@ -12,6 +12,11 @@
},
approverNamesStringified() {
const approvers = this.suggestedApprovers;
if (!approvers) {
return '';
}
return approvers.length === 1 ? approvers[0].name :
approvers.reduce((memo, curr, index) => {
const nextMemo = `${memo}${curr.name}`;
......
......@@ -36,7 +36,7 @@
</span>
<span v-for='n in approvalsLeft'>
<link-to-member-avatar
:non-user='true'
:clickable='false'
:avatar-html='pendingAvatarSvg'
:show-tooltip='false'
extra-link-class='hide-asset'>
......
......@@ -32,9 +32,9 @@
required: false,
default: false,
},
nonUser: {
clickable: {
type: Boolean,
default: false,
default: true,
required: false,
},
tooltipContainer: {
......@@ -53,13 +53,12 @@
},
data() {
return {
// TODO: Rename baseClass
avatarBaseClass: 'avatar avatar-inline',
};
},
computed: {
avatarSizeClass() {
return `s${this.avatarSizeClass}`;
return `s${this.size}`;
},
avatarHtmlClass() {
return `${this.avatarSizeClass} ${this.avatarBaseClass}`;
......@@ -71,7 +70,7 @@
return `${this.avatarBaseClass} ${this.avatarSizeClass} ${this.extraAvatarClass}`;
},
disabledClass() {
return this.nonUser ? 'disabled' : '';
return !this.clickable ? 'disabled' : '';
},
linkClass() {
return `author_link ${this.tooltipClass} ${this.extraLinkClass} ${this.disabledClass}`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment