diff options
author | Chocobozzz <me@florianbigard.com> | 2022-05-02 13:46:09 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-05-02 13:46:09 +0200 |
commit | 4428ad543e0c717eb7edb27003b9d9a52c616d5d (patch) | |
tree | 950f225b265b9a523509afc5e9961fb5c07523e1 /client/src/app/shared/shared-main | |
parent | 252e16e158d7a1e192126802d0ec32208f8f80be (diff) | |
download | PeerTube-4428ad543e0c717eb7edb27003b9d9a52c616d5d.tar.gz PeerTube-4428ad543e0c717eb7edb27003b9d9a52c616d5d.tar.zst PeerTube-4428ad543e0c717eb7edb27003b9d9a52c616d5d.zip |
Fix avatar responsive
Diffstat (limited to 'client/src/app/shared/shared-main')
-rw-r--r-- | client/src/app/shared/shared-main/account/account.model.ts | 6 | ||||
-rw-r--r-- | client/src/app/shared/shared-main/account/actor.model.ts | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts index a26a9c11c..e34f6ef64 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts | |||
@@ -17,12 +17,12 @@ export class Account extends Actor implements ServerAccount { | |||
17 | 17 | ||
18 | userId?: number | 18 | userId?: number |
19 | 19 | ||
20 | static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) { | 20 | static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) { |
21 | return Actor.GET_ACTOR_AVATAR_URL(actor, size) | 21 | return Actor.GET_ACTOR_AVATAR_URL(actor, size) |
22 | } | 22 | } |
23 | 23 | ||
24 | static GET_DEFAULT_AVATAR_URL (size: number) { | 24 | static GET_DEFAULT_AVATAR_URL (size?: number) { |
25 | if (size <= 48) { | 25 | if (size && size <= 48) { |
26 | return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png` | 26 | return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png` |
27 | } | 27 | } |
28 | 28 | ||
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts index 977fdb7e5..8427c9902 100644 --- a/client/src/app/shared/shared-main/account/actor.model.ts +++ b/client/src/app/shared/shared-main/account/actor.model.ts | |||
@@ -20,8 +20,12 @@ export abstract class Actor implements ServerActor { | |||
20 | 20 | ||
21 | isLocal: boolean | 21 | isLocal: boolean |
22 | 22 | ||
23 | static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) { | 23 | static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) { |
24 | const avatar = actor.avatars.sort((a, b) => a.width - b.width).find(a => a.width >= size) | 24 | const avatars = actor.avatars.sort((a, b) => a.width - b.width) |
25 | |||
26 | const avatar = size | ||
27 | ? avatars.find(a => a.width >= size) | ||
28 | : avatars[0] | ||
25 | 29 | ||
26 | if (!avatar) return '' | 30 | if (!avatar) return '' |
27 | if (avatar.url) return avatar.url | 31 | if (avatar.url) return avatar.url |