diff options
Diffstat (limited to 'client/src/app/videos/+video-watch')
-rw-r--r-- | client/src/app/videos/+video-watch/comment/video-comment-add.component.ts | 5 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/modal/video-report.component.ts | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts index c70e544a3..46d7a4e9e 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts | |||
@@ -3,13 +3,13 @@ import { NotificationsService } from 'angular2-notifications' | |||
3 | import { Observable } from 'rxjs' | 3 | import { Observable } from 'rxjs' |
4 | import { VideoCommentCreate } from '../../../../../../shared/models/videos/video-comment.model' | 4 | import { VideoCommentCreate } from '../../../../../../shared/models/videos/video-comment.model' |
5 | import { FormReactive } from '../../../shared' | 5 | import { FormReactive } from '../../../shared' |
6 | import { VIDEO_COMMENT_TEXT } from '../../../shared/forms/form-validators/video-comment' | ||
7 | import { User } from '../../../shared/users' | 6 | import { User } from '../../../shared/users' |
8 | import { Video } from '../../../shared/video/video.model' | 7 | import { Video } from '../../../shared/video/video.model' |
9 | import { VideoComment } from './video-comment.model' | 8 | import { VideoComment } from './video-comment.model' |
10 | import { VideoCommentService } from './video-comment.service' | 9 | import { VideoCommentService } from './video-comment.service' |
11 | import { I18n } from '@ngx-translate/i18n-polyfill' | 10 | import { I18n } from '@ngx-translate/i18n-polyfill' |
12 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 11 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
12 | import { VideoCommentValidatorsService } from '@app/shared/forms/form-validators/video-comment-validators.service' | ||
13 | 13 | ||
14 | @Component({ | 14 | @Component({ |
15 | selector: 'my-video-comment-add', | 15 | selector: 'my-video-comment-add', |
@@ -29,6 +29,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { | |||
29 | 29 | ||
30 | constructor ( | 30 | constructor ( |
31 | protected formValidatorService: FormValidatorService, | 31 | protected formValidatorService: FormValidatorService, |
32 | private videoCommentValidatorsService: VideoCommentValidatorsService, | ||
32 | private notificationsService: NotificationsService, | 33 | private notificationsService: NotificationsService, |
33 | private videoCommentService: VideoCommentService, | 34 | private videoCommentService: VideoCommentService, |
34 | private i18n: I18n | 35 | private i18n: I18n |
@@ -38,7 +39,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { | |||
38 | 39 | ||
39 | ngOnInit () { | 40 | ngOnInit () { |
40 | this.buildForm({ | 41 | this.buildForm({ |
41 | text: VIDEO_COMMENT_TEXT | 42 | text: this.videoCommentValidatorsService.VIDEO_COMMENT_TEXT |
42 | }) | 43 | }) |
43 | 44 | ||
44 | if (this.focusOnInit === true) { | 45 | if (this.focusOnInit === true) { |
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.ts b/client/src/app/videos/+video-watch/modal/video-report.component.ts index 8641e8dfb..d9768fdac 100644 --- a/client/src/app/videos/+video-watch/modal/video-report.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-report.component.ts | |||
@@ -1,12 +1,11 @@ | |||
1 | import { Component, Input, OnInit, ViewChild } from '@angular/core' | 1 | import { Component, Input, OnInit, ViewChild } from '@angular/core' |
2 | import { FormBuilder, FormGroup } from '@angular/forms' | ||
3 | import { NotificationsService } from 'angular2-notifications' | 2 | import { NotificationsService } from 'angular2-notifications' |
4 | import { ModalDirective } from 'ngx-bootstrap/modal' | 3 | import { ModalDirective } from 'ngx-bootstrap/modal' |
5 | import { FormReactive, VIDEO_ABUSE_REASON, VideoAbuseService } from '../../../shared/index' | 4 | import { FormReactive, VideoAbuseService } from '../../../shared/index' |
6 | import { VideoDetails } from '../../../shared/video/video-details.model' | 5 | import { VideoDetails } from '../../../shared/video/video-details.model' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { FormReactiveErrors, FormReactiveValidationMessages } from '@app/shared' | ||
9 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
8 | import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service' | ||
10 | 9 | ||
11 | @Component({ | 10 | @Component({ |
12 | selector: 'my-video-report', | 11 | selector: 'my-video-report', |
@@ -22,6 +21,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { | |||
22 | 21 | ||
23 | constructor ( | 22 | constructor ( |
24 | protected formValidatorService: FormValidatorService, | 23 | protected formValidatorService: FormValidatorService, |
24 | private videoAbuseValidatorsService: VideoAbuseValidatorsService, | ||
25 | private videoAbuseService: VideoAbuseService, | 25 | private videoAbuseService: VideoAbuseService, |
26 | private notificationsService: NotificationsService, | 26 | private notificationsService: NotificationsService, |
27 | private i18n: I18n | 27 | private i18n: I18n |
@@ -31,7 +31,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { | |||
31 | 31 | ||
32 | ngOnInit () { | 32 | ngOnInit () { |
33 | this.buildForm({ | 33 | this.buildForm({ |
34 | reason: VIDEO_ABUSE_REASON | 34 | reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON |
35 | }) | 35 | }) |
36 | } | 36 | } |
37 | 37 | ||