aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/shared-actor-image-edit
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared/shared-actor-image-edit')
-rw-r--r--client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts7
-rw-r--r--client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts6
2 files changed, 6 insertions, 7 deletions
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
index 2c0e45e20..8b7d64ed3 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
@@ -1,9 +1,9 @@
1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' 1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
2import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'
3import { Notifier, ServerService } from '@app/core' 2import { Notifier, ServerService } from '@app/core'
4import { Account, VideoChannel } from '@app/shared/shared-main' 3import { Account, VideoChannel } from '@app/shared/shared-main'
5import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' 4import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
6import { getBytes } from '@root-helpers/bytes' 5import { getBytes } from '@root-helpers/bytes'
6import { imageToDataURL } from '@root-helpers/images'
7 7
8@Component({ 8@Component({
9 selector: 'my-actor-avatar-edit', 9 selector: 'my-actor-avatar-edit',
@@ -30,10 +30,9 @@ export class ActorAvatarEditComponent implements OnInit {
30 maxAvatarSize = 0 30 maxAvatarSize = 0
31 avatarExtensions = '' 31 avatarExtensions = ''
32 32
33 preview: SafeResourceUrl 33 preview: string
34 34
35 constructor ( 35 constructor (
36 private sanitizer: DomSanitizer,
37 private serverService: ServerService, 36 private serverService: ServerService,
38 private notifier: Notifier 37 private notifier: Notifier
39 ) { } 38 ) { }
@@ -63,7 +62,7 @@ export class ActorAvatarEditComponent implements OnInit {
63 this.avatarChange.emit(formData) 62 this.avatarChange.emit(formData)
64 63
65 if (this.previewImage) { 64 if (this.previewImage) {
66 this.preview = this.sanitizer.bypassSecurityTrustResourceUrl(URL.createObjectURL(avatarfile)) 65 imageToDataURL(avatarfile).then(result => this.preview = result)
67 } 66 }
68 } 67 }
69 68
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
index cba2c5db3..47b537b74 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
@@ -1,9 +1,10 @@
1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' 1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
2import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser' 2import { SafeResourceUrl } from '@angular/platform-browser'
3import { Notifier, ServerService } from '@app/core' 3import { Notifier, ServerService } from '@app/core'
4import { VideoChannel } from '@app/shared/shared-main' 4import { VideoChannel } from '@app/shared/shared-main'
5import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' 5import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
6import { getBytes } from '@root-helpers/bytes' 6import { getBytes } from '@root-helpers/bytes'
7import { imageToDataURL } from '@root-helpers/images'
7 8
8@Component({ 9@Component({
9 selector: 'my-actor-banner-edit', 10 selector: 'my-actor-banner-edit',
@@ -30,7 +31,6 @@ export class ActorBannerEditComponent implements OnInit {
30 preview: SafeResourceUrl 31 preview: SafeResourceUrl
31 32
32 constructor ( 33 constructor (
33 private sanitizer: DomSanitizer,
34 private serverService: ServerService, 34 private serverService: ServerService,
35 private notifier: Notifier 35 private notifier: Notifier
36 ) { } 36 ) { }
@@ -59,7 +59,7 @@ export class ActorBannerEditComponent implements OnInit {
59 this.bannerChange.emit(formData) 59 this.bannerChange.emit(formData)
60 60
61 if (this.previewImage) { 61 if (this.previewImage) {
62 this.preview = this.sanitizer.bypassSecurityTrustResourceUrl(URL.createObjectURL(bannerfile)) 62 imageToDataURL(bannerfile).then(result => this.preview = result)
63 } 63 }
64 } 64 }
65 65