aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos/+video-edit/video-add-components
diff options
context:
space:
mode:
authorkontrollanten <6680299+kontrollanten@users.noreply.github.com>2022-04-08 11:14:12 +0200
committerGitHub <noreply@github.com>2022-04-08 11:14:12 +0200
commit72dd3a7c26cf0ef7b0e1780afd7bdbf7fea1d2b1 (patch)
treeec41a8adc10bc9991f494c4ce0e7eb5cf35cb7a6 /client/src/app/+videos/+video-edit/video-add-components
parent68a4b1e587150e58bc8471fd32c6d7316095afa4 (diff)
downloadPeerTube-72dd3a7c26cf0ef7b0e1780afd7bdbf7fea1d2b1.tar.gz
PeerTube-72dd3a7c26cf0ef7b0e1780afd7bdbf7fea1d2b1.tar.zst
PeerTube-72dd3a7c26cf0ef7b0e1780afd7bdbf7fea1d2b1.zip
Fix titles on upload page (#4904)
* client/video-add: fix route titles * client/video-add: show progress in page title * Styling Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'client/src/app/+videos/+video-edit/video-add-components')
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts26
1 files changed, 22 insertions, 4 deletions
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index ec858c8a8..0a83215b9 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -3,8 +3,8 @@ import { UploadState, UploadxOptions, UploadxService } from 'ngx-uploadx'
3import { isIOS } from '@root-helpers/web-browser' 3import { isIOS } from '@root-helpers/web-browser'
4import { HttpErrorResponse, HttpEventType, HttpHeaders } from '@angular/common/http' 4import { HttpErrorResponse, HttpEventType, HttpHeaders } from '@angular/common/http'
5import { AfterViewInit, Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' 5import { AfterViewInit, Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
6import { Router } from '@angular/router' 6import { ActivatedRoute, Router } from '@angular/router'
7import { AuthService, CanComponentDeactivate, HooksService, Notifier, ServerService, UserService } from '@app/core' 7import { AuthService, CanComponentDeactivate, HooksService, MetaService, Notifier, ServerService, UserService } from '@app/core'
8import { genericUploadErrorHandler, scrollToTop } from '@app/helpers' 8import { genericUploadErrorHandler, scrollToTop } from '@app/helpers'
9import { FormValidatorService } from '@app/shared/shared-forms' 9import { FormValidatorService } from '@app/shared/shared-forms'
10import { BytesPipe, Video, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' 10import { BytesPipe, Video, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
@@ -66,7 +66,9 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
66 private userService: UserService, 66 private userService: UserService,
67 private router: Router, 67 private router: Router,
68 private hooks: HooksService, 68 private hooks: HooksService,
69 private resumableUploadService: UploadxService 69 private resumableUploadService: UploadxService,
70 private metaService: MetaService,
71 private route: ActivatedRoute
70 ) { 72 ) {
71 super() 73 super()
72 } 74 }
@@ -113,6 +115,18 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
113 } 115 }
114 } 116 }
115 117
118 updateTitle () {
119 const videoName = this.form.get('name').value
120
121 if (this.videoUploaded) {
122 this.metaService.setTitle($localize`Upload ${videoName}`)
123 } else if (this.isUploadingAudioFile || this.isUploadingVideo) {
124 this.metaService.setTitle(`${this.videoUploadPercents}% - ${videoName}`)
125 } else {
126 this.metaService.update(this.route.snapshot.data['meta'])
127 }
128 }
129
116 onUploadVideoOngoing (state: UploadState) { 130 onUploadVideoOngoing (state: UploadState) {
117 switch (state.status) { 131 switch (state.status) {
118 case 'error': { 132 case 'error': {
@@ -153,7 +167,8 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
153 break 167 break
154 168
155 case 'uploading': 169 case 'uploading':
156 this.videoUploadPercents = state.progress 170 // TODO: remove || 0 when // https://github.com/kukhariev/ngx-uploadx/pull/368 is released
171 this.videoUploadPercents = state.progress || 0
157 break 172 break
158 173
159 case 'paused': 174 case 'paused':
@@ -167,6 +182,8 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
167 this.videoUploadedIds = state?.response.video 182 this.videoUploadedIds = state?.response.video
168 break 183 break
169 } 184 }
185
186 this.updateTitle()
170 } 187 }
171 188
172 onFileDropped (files: FileList) { 189 onFileDropped (files: FileList) {
@@ -305,6 +322,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
305 }) 322 })
306 323
307 this.firstStepDone.emit(name) 324 this.firstStepDone.emit(name)
325 this.updateTitle()
308 } 326 }
309 327
310 private checkGlobalUserQuota (videofile: File) { 328 private checkGlobalUserQuota (videofile: File) {