Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add loader when updating the video

Chocobozzz55f8ee424961
diff --git a/client/src/app/+videos-publish-manage/+video-manage/video-manage.component.ts b/client/src/app/+videos-publish-manage/+video-manage/video-manage.component.ts
index f1f9965bba..305a4c46b4 100644
--- a/client/src/app/+videos-publish-manage/+video-manage/video-manage.component.ts
+++ b/client/src/app/+videos-publish-manage/+video-manage/video-manage.component.ts
@@ -22,9 +22,6 @@ export class VideoManageComponent implements OnInit, OnDestroy, CanComponentDeac
private manageController = inject(VideoManageController)
- isUpdatingVideo = false
- loaded = false
-
ngOnInit () {
const data = this.route.snapshot.data.resolverData as VideoManageResolverData
const { userChannels, userQuota, privacies, videoEdit } = data
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
index c251093eb4..cb69138058 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
@@ -21,7 +21,8 @@
<my-button
theme="primary" class="save-button"
icon="circle-tick"
- [disabled]="!canUpdate() || !hasPendingChanges()" (click)="onWantToUpdate()"
+ [disabled]="!canUpdate() || !hasPendingChanges()" (click)="onWantToUpdate()"
+ [loading]="isUpdating"
form="video-manage-form"
>
@if (hasStudioTasks()) {
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts
index fde2b092bf..d77007df46 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts
+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts
@@ -48,7 +48,8 @@ export class VideoManageContainerComponent implements OnInit, OnDestroy {
canRetryUpload = true
- private isUpdating = false
+ isUpdating = false
+
private videoEdit: VideoEdit
ngOnInit (): void {
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html
index 00a4376da0..a112c03553 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.html
+++ b/client/src/app/shared/shared-main/buttons/button.component.html
@@ -21,7 +21,8 @@
}
<ng-template #content>
- <my-loader size="sm" [ngClass]="{ displayed: loading() }" [loading]="loading()"></my-loader>
+ <my-loader size="md" [ngClass]="{ displayed: loading() }" [loading]="loading()"></my-loader>
+
@if (icon() && !loading()) {
<my-global-icon [iconName]="icon()"></my-global-icon>
}
diff --git a/client/src/app/shared/shared-main/common/loader.component.ts b/client/src/app/shared/shared-main/common/loader.component.ts
index 4b8b8acd65..bb10dd9c56 100644
--- a/client/src/app/shared/shared-main/common/loader.component.ts
+++ b/client/src/app/shared/shared-main/common/loader.component.ts
@@ -3,12 +3,15 @@ import { NgStyle } from '@angular/common'
@Component({
selector: 'my-loader',
- template: `@if (loading()) {<div class="spinner-border" [ngStyle]="getStyle()" role="status"></div>}`,
+ template: `
+ @if (loading()) {
+ <div class="spinner-border" [ngStyle]="getStyle()" role="status"></div>
+ }`,
imports: [ NgStyle ]
})
export class LoaderComponent {
- readonly loading = input<boolean, unknown>(undefined, { transform: booleanAttribute })
- readonly size = input<'sm' | 'xl'>(undefined)
+ readonly loading = input(false, { transform: booleanAttribute })
+ readonly size = input<'sm' | 'md' | 'xl'>()
private readonly sizes = {
sm: {
@@ -16,6 +19,11 @@ export class LoaderComponent {
'height': '1rem',
'border-width': '0.15rem'
},
+ md: {
+ 'width': '1.5rem',
+ 'height': '1.5rem',
+ 'border-width': '0.15rem'
+ },
xl: {
width: '3rem',
height: '3rem'