diff options
Diffstat (limited to 'client/src/app/videos/+video-watch')
7 files changed, 12 insertions, 12 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 ac1d02d94..8cdd37680 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 | |||
@@ -27,8 +27,8 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { | |||
27 | 27 | ||
28 | @Output() commentCreated = new EventEmitter<VideoCommentCreate>() | 28 | @Output() commentCreated = new EventEmitter<VideoCommentCreate>() |
29 | 29 | ||
30 | @ViewChild('visitorModal') visitorModal: NgbModal | 30 | @ViewChild('visitorModal', { static: true }) visitorModal: NgbModal |
31 | @ViewChild('textarea') textareaElement: ElementRef | 31 | @ViewChild('textarea', { static: true }) textareaElement: ElementRef |
32 | 32 | ||
33 | addingComment = false | 33 | addingComment = false |
34 | 34 | ||
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts index 5bafc55e5..64bd18072 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts | |||
@@ -20,7 +20,7 @@ import { HooksService } from '@app/core/plugins/hooks.service' | |||
20 | styleUrls: ['./video-comments.component.scss'] | 20 | styleUrls: ['./video-comments.component.scss'] |
21 | }) | 21 | }) |
22 | export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy { | 22 | export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy { |
23 | @ViewChild('commentHighlightBlock') commentHighlightBlock: ElementRef | 23 | @ViewChild('commentHighlightBlock', { static: false }) commentHighlightBlock: ElementRef |
24 | @Input() video: VideoDetails | 24 | @Input() video: VideoDetails |
25 | @Input() user: User | 25 | @Input() user: User |
26 | 26 | ||
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html index 82e59d04d..e0be9f265 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.html +++ b/client/src/app/videos/+video-watch/modal/video-share.component.html | |||
@@ -27,7 +27,7 @@ | |||
27 | <ngb-tab i18n-title title="QR-Code" id="qrcode"> | 27 | <ngb-tab i18n-title title="QR-Code" id="qrcode"> |
28 | <ng-template ngbTabContent> | 28 | <ng-template ngbTabContent> |
29 | <div class="tab-content"> | 29 | <div class="tab-content"> |
30 | <ngx-qrcode qrc-element-type="url" [qrc-value]="getVideoUrl()" qrc-errorCorrectionLevel="Q"></ngx-qrcode> | 30 | <qrcode [qrdata]="getVideoUrl()" size="256" level="Q"></qrcode> |
31 | </div> | 31 | </div> |
32 | </ng-template> | 32 | </ng-template> |
33 | </ngb-tab> | 33 | </ngb-tab> |
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts index eaaf6b902..f45afccfb 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts | |||
@@ -30,7 +30,7 @@ type Customizations = { | |||
30 | styleUrls: [ './video-share.component.scss' ] | 30 | styleUrls: [ './video-share.component.scss' ] |
31 | }) | 31 | }) |
32 | export class VideoShareComponent { | 32 | export class VideoShareComponent { |
33 | @ViewChild('modal') modal: ElementRef | 33 | @ViewChild('modal', { static: true }) modal: ElementRef |
34 | 34 | ||
35 | @Input() video: VideoDetails = null | 35 | @Input() video: VideoDetails = null |
36 | @Input() videoCaptions: VideoCaption[] = [] | 36 | @Input() videoCaptions: VideoCaption[] = [] |
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts index 5e7afa012..b56a51fbf 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts | |||
@@ -11,7 +11,7 @@ import { MarkdownService } from '@app/shared/renderer' | |||
11 | export class VideoSupportComponent { | 11 | export class VideoSupportComponent { |
12 | @Input() video: VideoDetails = null | 12 | @Input() video: VideoDetails = null |
13 | 13 | ||
14 | @ViewChild('modal') modal: NgbModal | 14 | @ViewChild('modal', { static: true }) modal: NgbModal |
15 | 15 | ||
16 | videoHTMLSupport = '' | 16 | videoHTMLSupport = '' |
17 | 17 | ||
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 228c45a06..027c2b026 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -43,10 +43,10 @@ import { HooksService } from '@app/core/plugins/hooks.service' | |||
43 | export class VideoWatchComponent implements OnInit, OnDestroy { | 43 | export class VideoWatchComponent implements OnInit, OnDestroy { |
44 | private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern' | 44 | private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern' |
45 | 45 | ||
46 | @ViewChild('videoWatchPlaylist') videoWatchPlaylist: VideoWatchPlaylistComponent | 46 | @ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent |
47 | @ViewChild('videoShareModal') videoShareModal: VideoShareComponent | 47 | @ViewChild('videoShareModal', { static: false }) videoShareModal: VideoShareComponent |
48 | @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent | 48 | @ViewChild('videoSupportModal', { static: false }) videoSupportModal: VideoSupportComponent |
49 | @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent | 49 | @ViewChild('subscribeButton', { static: false }) subscribeButton: SubscribeButtonComponent |
50 | 50 | ||
51 | player: any | 51 | player: any |
52 | playerElement: HTMLVideoElement | 52 | playerElement: HTMLVideoElement |
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index 67596a3da..f083aca4d 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts | |||
@@ -8,17 +8,17 @@ import { VideoCommentsComponent } from './comment/video-comments.component' | |||
8 | import { VideoShareComponent } from './modal/video-share.component' | 8 | import { VideoShareComponent } from './modal/video-share.component' |
9 | import { VideoWatchRoutingModule } from './video-watch-routing.module' | 9 | import { VideoWatchRoutingModule } from './video-watch-routing.module' |
10 | import { VideoWatchComponent } from './video-watch.component' | 10 | import { VideoWatchComponent } from './video-watch.component' |
11 | import { NgxQRCodeModule } from 'ngx-qrcode2' | ||
12 | import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' | 11 | import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' |
13 | import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module' | 12 | import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module' |
14 | import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component' | 13 | import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component' |
14 | import { QRCodeModule } from 'angularx-qrcode' | ||
15 | 15 | ||
16 | @NgModule({ | 16 | @NgModule({ |
17 | imports: [ | 17 | imports: [ |
18 | VideoWatchRoutingModule, | 18 | VideoWatchRoutingModule, |
19 | SharedModule, | 19 | SharedModule, |
20 | NgbTooltipModule, | 20 | NgbTooltipModule, |
21 | NgxQRCodeModule, | 21 | QRCodeModule, |
22 | RecommendationsModule | 22 | RecommendationsModule |
23 | ], | 23 | ], |
24 | 24 | ||