diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-01-07 15:42:14 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-01-09 09:25:32 +0100 |
commit | c511c3f010c45e08e7736a935bf721527db806c8 (patch) | |
tree | 5abc1ddd09b4d5b9b779f6d057fbda58015eab68 /client/src/app/shared | |
parent | fbc77eb648bda9add4634c08dbb6af48c3670b5d (diff) | |
download | PeerTube-c511c3f010c45e08e7736a935bf721527db806c8.tar.gz PeerTube-c511c3f010c45e08e7736a935bf721527db806c8.tar.zst PeerTube-c511c3f010c45e08e7736a935bf721527db806c8.zip |
Show default avatar on network error for comments
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/actor/actor.model.ts | 4 | ||||
-rw-r--r-- | client/src/app/shared/angular/timestamp-route-transformer.directive.ts | 5 | ||||
-rw-r--r-- | client/src/app/shared/misc/utils.ts | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts index 285f71ce0..9cc51b948 100644 --- a/client/src/app/shared/actor/actor.model.ts +++ b/client/src/app/shared/actor/actor.model.ts | |||
@@ -20,6 +20,10 @@ export abstract class Actor implements ActorServer { | |||
20 | 20 | ||
21 | if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path | 21 | if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path |
22 | 22 | ||
23 | this.GET_DEFAULT_AVATAR_URL() | ||
24 | } | ||
25 | |||
26 | static GET_DEFAULT_AVATAR_URL () { | ||
23 | return window.location.origin + '/client/assets/images/default-avatar.png' | 27 | return window.location.origin + '/client/assets/images/default-avatar.png' |
24 | } | 28 | } |
25 | 29 | ||
diff --git a/client/src/app/shared/angular/timestamp-route-transformer.directive.ts b/client/src/app/shared/angular/timestamp-route-transformer.directive.ts index d71077d10..6e17957f8 100644 --- a/client/src/app/shared/angular/timestamp-route-transformer.directive.ts +++ b/client/src/app/shared/angular/timestamp-route-transformer.directive.ts | |||
@@ -1,9 +1,6 @@ | |||
1 | import { Directive, ElementRef, HostListener, Output, EventEmitter } from '@angular/core' | 1 | import { Directive, ElementRef, HostListener, Output, EventEmitter } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router } from '@angular/router' |
3 | 3 | import { ElementEvent } from '@app/shared/misc/utils' | |
4 | type ElementEvent = Omit<Event, 'target'> & { | ||
5 | target: HTMLInputElement | ||
6 | } | ||
7 | 4 | ||
8 | @Directive({ | 5 | @Directive({ |
9 | selector: '[timestampRouteTransformer]' | 6 | selector: '[timestampRouteTransformer]' |
diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index b1d1fc0b5..096fd61e2 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts | |||
@@ -4,6 +4,10 @@ import { DatePipe } from '@angular/common' | |||
4 | import { environment } from '../../../environments/environment' | 4 | import { environment } from '../../../environments/environment' |
5 | import { AuthService } from '../../core/auth' | 5 | import { AuthService } from '../../core/auth' |
6 | 6 | ||
7 | type ElementEvent = Omit<Event, 'target'> & { | ||
8 | target: HTMLElement | ||
9 | } | ||
10 | |||
7 | function getParameterByName (name: string, url: string) { | 11 | function getParameterByName (name: string, url: string) { |
8 | if (!url) url = window.location.href | 12 | if (!url) url = window.location.href |
9 | name = name.replace(/[\[\]]/g, '\\$&') | 13 | name = name.replace(/[\[\]]/g, '\\$&') |
@@ -190,6 +194,7 @@ function isXPercentInViewport (el: HTMLElement, percentVisible: number) { | |||
190 | } | 194 | } |
191 | 195 | ||
192 | export { | 196 | export { |
197 | ElementEvent, | ||
193 | sortBy, | 198 | sortBy, |
194 | durationToString, | 199 | durationToString, |
195 | lineFeedToHtml, | 200 | lineFeedToHtml, |