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

Fix avatarSizeClass error and nonUser -> clickable.

parent e68a7f3c
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
}, },
approverNamesStringified() { approverNamesStringified() {
const approvers = this.suggestedApprovers; const approvers = this.suggestedApprovers;
if (!approvers) {
return '';
}
return approvers.length === 1 ? approvers[0].name : return approvers.length === 1 ? approvers[0].name :
approvers.reduce((memo, curr, index) => { approvers.reduce((memo, curr, index) => {
const nextMemo = `${memo}${curr.name}`; const nextMemo = `${memo}${curr.name}`;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</span> </span>
<span v-for='n in approvalsLeft'> <span v-for='n in approvalsLeft'>
<link-to-member-avatar <link-to-member-avatar
:non-user='true' :clickable='false'
:avatar-html='pendingAvatarSvg' :avatar-html='pendingAvatarSvg'
:show-tooltip='false' :show-tooltip='false'
extra-link-class='hide-asset'> extra-link-class='hide-asset'>
......
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
required: false, required: false,
default: false, default: false,
}, },
nonUser: { clickable: {
type: Boolean, type: Boolean,
default: false, default: true,
required: false, required: false,
}, },
tooltipContainer: { tooltipContainer: {
...@@ -53,13 +53,12 @@ ...@@ -53,13 +53,12 @@
}, },
data() { data() {
return { return {
// TODO: Rename baseClass
avatarBaseClass: 'avatar avatar-inline', avatarBaseClass: 'avatar avatar-inline',
}; };
}, },
computed: { computed: {
avatarSizeClass() { avatarSizeClass() {
return `s${this.avatarSizeClass}`; return `s${this.size}`;
}, },
avatarHtmlClass() { avatarHtmlClass() {
return `${this.avatarSizeClass} ${this.avatarBaseClass}`; return `${this.avatarSizeClass} ${this.avatarBaseClass}`;
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
return `${this.avatarBaseClass} ${this.avatarSizeClass} ${this.extraAvatarClass}`; return `${this.avatarBaseClass} ${this.avatarSizeClass} ${this.extraAvatarClass}`;
}, },
disabledClass() { disabledClass() {
return this.nonUser ? 'disabled' : ''; return !this.clickable ? 'disabled' : '';
}, },
linkClass() { linkClass() {
return `author_link ${this.tooltipClass} ${this.extraLinkClass} ${this.disabledClass}` 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