From 047559af6e7570ac98b0d11ab43e60a9c5c1f5c3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 6 Aug 2018 15:18:35 +0200 Subject: [PATCH] video-import -> video-import-url --- .../app/videos/+video-edit/video-add.component.html | 2 +- .../src/app/videos/+video-edit/video-add.component.ts | 10 +++++----- client/src/app/videos/+video-edit/video-add.module.ts | 4 ++-- ....component.html => video-import-url.component.html} | 0 ....component.scss => video-import-url.component.scss} | 0 ...port.component.ts => video-import-url.component.ts} | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) rename client/src/app/videos/+video-edit/{video-import.component.html => video-import-url.component.html} (100%) rename client/src/app/videos/+video-edit/{video-import.component.scss => video-import-url.component.scss} (100%) rename client/src/app/videos/+video-edit/{video-import.component.ts => video-import-url.component.ts} (94%) 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 @@ - + 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 @@ import { Component, ViewChild } from '@angular/core' import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' -import { VideoImportComponent } from '@app/videos/+video-edit/video-import.component' +import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' import { ServerService } from '@app/core' @@ -11,23 +11,23 @@ import { ServerService } from '@app/core' }) export class VideoAddComponent implements CanComponentDeactivate { @ViewChild('videoUpload') videoUpload: VideoUploadComponent - @ViewChild('videoImport') videoImport: VideoImportComponent + @ViewChild('videoImportUrl') videoImportUrl: VideoImportUrlComponent - secondStepType: 'upload' | 'import' + secondStepType: 'upload' | 'import-url' videoName: string constructor ( private serverService: ServerService ) {} - onFirstStepDone (type: 'upload' | 'import', videoName: string) { + onFirstStepDone (type: 'upload' | 'import-url', videoName: string) { this.secondStepType = type this.videoName = videoName } canDeactivate () { if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate() - if (this.secondStepType === 'import') return this.videoImport.canDeactivate() + if (this.secondStepType === 'import-url') return this.videoImportUrl.canDeactivate() return { canDeactivate: true } } 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' import { VideoAddComponent } from './video-add.component' import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' -import { VideoImportComponent } from '@app/videos/+video-edit/video-import.component' +import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' @NgModule({ imports: [ @@ -18,7 +18,7 @@ import { VideoImportComponent } from '@app/videos/+video-edit/video-import.compo declarations: [ VideoAddComponent, VideoUploadComponent, - VideoImportComponent + VideoImportUrlComponent ], exports: [ 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 similarity index 100% rename from client/src/app/videos/+video-edit/video-import.component.html rename to 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 similarity index 100% rename from client/src/app/videos/+video-edit/video-import.component.scss rename to 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 similarity index 94% rename from client/src/app/videos/+video-edit/video-import.component.ts rename to 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' import { VideoSend } from '@app/videos/+video-edit/shared/video-send' @Component({ - selector: 'my-video-import', - templateUrl: './video-import.component.html', + selector: 'my-video-import-url', + templateUrl: './video-import-url.component.html', styleUrls: [ './shared/video-edit.component.scss', - './video-import.component.scss' + './video-import-url.component.scss' ] }) -export class VideoImportComponent extends VideoSend implements OnInit, CanComponentDeactivate { +export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { @Output() firstStepDone = new EventEmitter() targetUrl = '' -- 2.41.0