diff options
-rw-r--r-- | client/src/app/videos/+video-edit/video-add.component.html | 2 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-add.component.ts | 10 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-add.module.ts | 4 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-import-url.component.html (renamed from client/src/app/videos/+video-edit/video-import.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-import-url.component.scss (renamed from client/src/app/videos/+video-edit/video-import.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/video-import-url.component.ts (renamed from client/src/app/videos/+video-edit/video-import.component.ts) | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html index 17d086fc6..7a50372e9 100644 --- a/client/src/app/videos/+video-edit/video-add.component.html +++ b/client/src/app/videos/+video-edit/video-add.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | </tab> | 11 | </tab> |
12 | 12 | ||
13 | <tab *ngIf="isVideoImportEnabled()" i18n-heading heading="Import with URL"> | 13 | <tab *ngIf="isVideoImportEnabled()" i18n-heading heading="Import with URL"> |
14 | <my-video-import #videoImport (firstStepDone)="onFirstStepDone('import', $event)"></my-video-import> | 14 | <my-video-import-url #videoImportUrl (firstStepDone)="onFirstStepDone('import-url', $event)"></my-video-import-url> |
15 | </tab> | 15 | </tab> |
16 | </tabset> | 16 | </tabset> |
17 | </div> | 17 | </div> |
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts index 69b364ddd..377ea5dd2 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, ViewChild } from '@angular/core' | 1 | import { Component, ViewChild } from '@angular/core' |
2 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | 2 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' |
3 | import { VideoImportComponent } from '@app/videos/+video-edit/video-import.component' | 3 | import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' |
4 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' | 4 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' |
5 | import { ServerService } from '@app/core' | 5 | import { ServerService } from '@app/core' |
6 | 6 | ||
@@ -11,23 +11,23 @@ import { ServerService } from '@app/core' | |||
11 | }) | 11 | }) |
12 | export class VideoAddComponent implements CanComponentDeactivate { | 12 | export class VideoAddComponent implements CanComponentDeactivate { |
13 | @ViewChild('videoUpload') videoUpload: VideoUploadComponent | 13 | @ViewChild('videoUpload') videoUpload: VideoUploadComponent |
14 | @ViewChild('videoImport') videoImport: VideoImportComponent | 14 | @ViewChild('videoImportUrl') videoImportUrl: VideoImportUrlComponent |
15 | 15 | ||
16 | secondStepType: 'upload' | 'import' | 16 | secondStepType: 'upload' | 'import-url' |
17 | videoName: string | 17 | videoName: string |
18 | 18 | ||
19 | constructor ( | 19 | constructor ( |
20 | private serverService: ServerService | 20 | private serverService: ServerService |
21 | ) {} | 21 | ) {} |
22 | 22 | ||
23 | onFirstStepDone (type: 'upload' | 'import', videoName: string) { | 23 | onFirstStepDone (type: 'upload' | 'import-url', videoName: string) { |
24 | this.secondStepType = type | 24 | this.secondStepType = type |
25 | this.videoName = videoName | 25 | this.videoName = videoName |
26 | } | 26 | } |
27 | 27 | ||
28 | canDeactivate () { | 28 | canDeactivate () { |
29 | if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate() | 29 | if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate() |
30 | if (this.secondStepType === 'import') return this.videoImport.canDeactivate() | 30 | if (this.secondStepType === 'import-url') return this.videoImportUrl.canDeactivate() |
31 | 31 | ||
32 | return { canDeactivate: true } | 32 | return { canDeactivate: true } |
33 | } | 33 | } |
diff --git a/client/src/app/videos/+video-edit/video-add.module.ts b/client/src/app/videos/+video-edit/video-add.module.ts index 91f544971..dd1a3875d 100644 --- a/client/src/app/videos/+video-edit/video-add.module.ts +++ b/client/src/app/videos/+video-edit/video-add.module.ts | |||
@@ -6,7 +6,7 @@ import { VideoAddRoutingModule } from './video-add-routing.module' | |||
6 | import { VideoAddComponent } from './video-add.component' | 6 | import { VideoAddComponent } from './video-add.component' |
7 | import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' | 7 | import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' |
8 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' | 8 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' |
9 | import { VideoImportComponent } from '@app/videos/+video-edit/video-import.component' | 9 | import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' |
10 | 10 | ||
11 | @NgModule({ | 11 | @NgModule({ |
12 | imports: [ | 12 | imports: [ |
@@ -18,7 +18,7 @@ import { VideoImportComponent } from '@app/videos/+video-edit/video-import.compo | |||
18 | declarations: [ | 18 | declarations: [ |
19 | VideoAddComponent, | 19 | VideoAddComponent, |
20 | VideoUploadComponent, | 20 | VideoUploadComponent, |
21 | VideoImportComponent | 21 | VideoImportUrlComponent |
22 | ], | 22 | ], |
23 | exports: [ | 23 | exports: [ |
24 | VideoAddComponent | 24 | VideoAddComponent |
diff --git a/client/src/app/videos/+video-edit/video-import.component.html b/client/src/app/videos/+video-edit/video-import-url.component.html index 6b431f6f6..6b431f6f6 100644 --- a/client/src/app/videos/+video-edit/video-import.component.html +++ b/client/src/app/videos/+video-edit/video-import-url.component.html | |||
diff --git a/client/src/app/videos/+video-edit/video-import.component.scss b/client/src/app/videos/+video-edit/video-import-url.component.scss index 9ada9db19..9ada9db19 100644 --- a/client/src/app/videos/+video-edit/video-import.component.scss +++ b/client/src/app/videos/+video-edit/video-import-url.component.scss | |||
diff --git a/client/src/app/videos/+video-edit/video-import.component.ts b/client/src/app/videos/+video-edit/video-import-url.component.ts index 5d355dc8b..99fcb6f00 100644 --- a/client/src/app/videos/+video-edit/video-import.component.ts +++ b/client/src/app/videos/+video-edit/video-import-url.component.ts | |||
@@ -14,14 +14,14 @@ import { VideoCaptionService } from '@app/shared/video-caption' | |||
14 | import { VideoSend } from '@app/videos/+video-edit/shared/video-send' | 14 | import { VideoSend } from '@app/videos/+video-edit/shared/video-send' |
15 | 15 | ||
16 | @Component({ | 16 | @Component({ |
17 | selector: 'my-video-import', | 17 | selector: 'my-video-import-url', |
18 | templateUrl: './video-import.component.html', | 18 | templateUrl: './video-import-url.component.html', |
19 | styleUrls: [ | 19 | styleUrls: [ |
20 | './shared/video-edit.component.scss', | 20 | './shared/video-edit.component.scss', |
21 | './video-import.component.scss' | 21 | './video-import-url.component.scss' |
22 | ] | 22 | ] |
23 | }) | 23 | }) |
24 | export class VideoImportComponent extends VideoSend implements OnInit, CanComponentDeactivate { | 24 | export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { |
25 | @Output() firstStepDone = new EventEmitter<string>() | 25 | @Output() firstStepDone = new EventEmitter<string>() |
26 | 26 | ||
27 | targetUrl = '' | 27 | targetUrl = '' |