diff options
Diffstat (limited to 'client/src/app/+videos/+video-edit/shared')
-rw-r--r-- | client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts | 4 | ||||
-rw-r--r-- | client/src/app/+videos/+video-edit/shared/video-edit.component.ts | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts index e48d16527..875911b91 100644 --- a/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts +++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts | |||
@@ -4,7 +4,7 @@ import { VIDEO_CAPTION_FILE_VALIDATOR, VIDEO_CAPTION_LANGUAGE_VALIDATOR } from ' | |||
4 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 4 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' |
5 | import { VideoCaptionEdit } from '@app/shared/shared-main' | 5 | import { VideoCaptionEdit } from '@app/shared/shared-main' |
6 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' | 6 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' |
7 | import { ServerConfig, VideoConstant } from '@shared/models' | 7 | import { HTMLServerConfig, VideoConstant } from '@shared/models' |
8 | 8 | ||
9 | @Component({ | 9 | @Component({ |
10 | selector: 'my-video-caption-add-modal', | 10 | selector: 'my-video-caption-add-modal', |
@@ -14,7 +14,7 @@ import { ServerConfig, VideoConstant } from '@shared/models' | |||
14 | 14 | ||
15 | export class VideoCaptionAddModalComponent extends FormReactive implements OnInit { | 15 | export class VideoCaptionAddModalComponent extends FormReactive implements OnInit { |
16 | @Input() existingCaptions: string[] | 16 | @Input() existingCaptions: string[] |
17 | @Input() serverConfig: ServerConfig | 17 | @Input() serverConfig: HTMLServerConfig |
18 | 18 | ||
19 | @Output() captionAdded = new EventEmitter<VideoCaptionEdit>() | 19 | @Output() captionAdded = new EventEmitter<VideoCaptionEdit>() |
20 | 20 | ||
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts index 3d916dbce..52801802b 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts | |||
@@ -22,10 +22,10 @@ import { FormReactiveValidationMessages, FormValidatorService } from '@app/share | |||
22 | import { InstanceService } from '@app/shared/shared-instance' | 22 | import { InstanceService } from '@app/shared/shared-instance' |
23 | import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' | 23 | import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' |
24 | import { | 24 | import { |
25 | HTMLServerConfig, | ||
25 | LiveVideo, | 26 | LiveVideo, |
26 | RegisterClientFormFieldOptions, | 27 | RegisterClientFormFieldOptions, |
27 | RegisterClientVideoFieldOptions, | 28 | RegisterClientVideoFieldOptions, |
28 | ServerConfig, | ||
29 | VideoConstant, | 29 | VideoConstant, |
30 | VideoDetails, | 30 | VideoDetails, |
31 | VideoPrivacy | 31 | VideoPrivacy |
@@ -84,7 +84,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
84 | calendarTimezone: string | 84 | calendarTimezone: string |
85 | calendarDateFormat: string | 85 | calendarDateFormat: string |
86 | 86 | ||
87 | serverConfig: ServerConfig | 87 | serverConfig: HTMLServerConfig |
88 | 88 | ||
89 | pluginFields: PluginField[] = [] | 89 | pluginFields: PluginField[] = [] |
90 | 90 | ||
@@ -194,9 +194,8 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
194 | } | 194 | } |
195 | }) | 195 | }) |
196 | 196 | ||
197 | this.serverConfig = this.serverService.getTmpConfig() | 197 | |
198 | this.serverService.getConfig() | 198 | this.serverConfig = this.serverService.getHTMLConfig() |
199 | .subscribe(config => this.serverConfig = config) | ||
200 | 199 | ||
201 | this.initialVideoCaptions = this.videoCaptions.map(c => c.language.id) | 200 | this.initialVideoCaptions = this.videoCaptions.map(c => c.language.id) |
202 | 201 | ||