Skip to content

Commit

Permalink
Merge pull request #4043 from nextcloud/bugfix/4042/fix-offline-user-…
Browse files Browse the repository at this point in the history
…status-icon

fix(NcRichContenteditable): Fix avatar overlayed with empty space whe…
  • Loading branch information
nickvergessen authored May 5, 2023
2 parents 7aeabed + e8bd8ba commit 88ac3ad
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default {
: null
},
haveStatus() {
return this.status?.icon || this.status?.status
return this.status?.icon || (this.status?.status && this.status?.status !== 'offline')
},
},
Expand Down
30 changes: 28 additions & 2 deletions src/components/NcRichContenteditable/NcRichContenteditable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,36 @@ export default {
clearAt: null,
icon: '🎡',
message: 'Having space in my name',
status: 'in space',
status: 'online',
},
subline: 'Visiting London',
}
},
'Test Offline': {
icon: 'icon-user',
id: 'Test Offline',
label: 'Test Offline',
source: 'users',
status: {
clearAt: null,
icon: null,
message: null,
status: 'offline',
},
subline: null,
},
'Test DND': {
icon: 'icon-user',
id: 'Test DND',
label: 'Test DND',
source: 'users',
status: {
clearAt: null,
icon: null,
message: 'Out sick',
status: 'dnd',
},
subline: 'Out sick',
},
}
}
},
Expand Down

0 comments on commit 88ac3ad

Please sign in to comment.