aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-25 19:01:13 +0100
committerChocobozzz <me@florianbigard.com>2018-01-25 19:09:47 +0100
commitf6a043df74bc755de8e658ba76a4e55980b96f66 (patch)
treefb2640669f59a89bd2f2d8ab52d296425a4c55ed /client/src/app/shared
parent94a5ff8a4a75d75bb9df542a39ce8769e7a7e6a4 (diff)
downloadPeerTube-f6a043df74bc755de8e658ba76a4e55980b96f66.tar.gz
PeerTube-f6a043df74bc755de8e658ba76a4e55980b96f66.tar.zst
PeerTube-f6a043df74bc755de8e658ba76a4e55980b96f66.zip
Improve video upload guard a little bit
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/guards/can-deactivate-guard.service.ts (renamed from client/src/app/shared/can-deactivate-guard.service.ts)13
1 files changed, 8 insertions, 5 deletions
diff --git a/client/src/app/shared/can-deactivate-guard.service.ts b/client/src/app/shared/guards/can-deactivate-guard.service.ts
index 4239df737..15618f699 100644
--- a/client/src/app/shared/can-deactivate-guard.service.ts
+++ b/client/src/app/shared/guards/can-deactivate-guard.service.ts
@@ -1,10 +1,10 @@
1import { Injectable } from '@angular/core' 1import { Injectable } from '@angular/core'
2import { CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router' 2import { CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'
3import { Observable } from 'rxjs/Observable' 3import { Observable } from 'rxjs/Observable'
4import { ConfirmService } from '../core' 4import { ConfirmService } from '../../core/index'
5 5
6export interface CanComponentDeactivate { 6export interface CanComponentDeactivate {
7 canDeactivate: () => Observable<boolean> | boolean 7 canDeactivate: () => { text?: string, canDeactivate: Observable<boolean> | boolean }
8} 8}
9 9
10@Injectable() 10@Injectable()
@@ -16,9 +16,12 @@ export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate>
16 currentState: RouterStateSnapshot, 16 currentState: RouterStateSnapshot,
17 nextState: RouterStateSnapshot 17 nextState: RouterStateSnapshot
18 ): Observable<boolean> | boolean { 18 ): Observable<boolean> | boolean {
19 return component.canDeactivate() || this.confirmService.confirm( 19 const result = component.canDeactivate()
20 'All unsaved data will be lost, are you sure you want to leave ?', 20 const text = result.text || 'All unsaved data will be lost, are you sure you want to leave this page?'
21 'Unsaved Data' 21
22 return result.canDeactivate || this.confirmService.confirm(
23 text,
24 'Warning'
22 ) 25 )
23 } 26 }
24 27