video-import -> video-import-url

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 17d086fc63f91634d230d8bc71f531e71bbb0456..7a50372e9435ed0bdf85c0d80391be918857e4b0 100644 (file)
--- 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 @@
     </tab>
 
     <tab *ngIf="isVideoImportEnabled()" i18n-heading heading="Import with URL">
-      <my-video-import #videoImport (firstStepDone)="onFirstStepDone('import', $event)"></my-video-import>
+      <my-video-import-url #videoImportUrl (firstStepDone)="onFirstStepDone('import-url', $event)"></my-video-import-url>
     </tab>
   </tabset>
 </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 69b364ddd01943683fbd94487d7c01f12463b8ee..377ea5dd217f0a3907df9969d175e5f57bd567bd 100644 (file)
--- 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 91f54497102437ca28f7bddd29eb6d21dcf20fba..dd1a3875dcdea511d1d8cc71df8b3946f2908d6b 100644 (file)
--- 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 5d355dc8b8d523a95ee056e6dbc7b17d2de48b62..99fcb6f0084508bc398fa7e1d88e638b19f61fa7 100644 (file)
--- 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<string>()
 
   targetUrl = ''