diff options
Diffstat (limited to 'client/src/app/+videos/+video-watch')
3 files changed, 17 insertions, 5 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 74c82fbfd..daee4be2a 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html | |||
@@ -136,7 +136,7 @@ | |||
136 | <ng-container *ngIf="isUserLoggedIn()"> | 136 | <ng-container *ngIf="isUserLoggedIn()"> |
137 | <my-video-actions-dropdown | 137 | <my-video-actions-dropdown |
138 | placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions" | 138 | placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions" |
139 | (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()" | 139 | [displayOptions]="videoActionsOptions" (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()" |
140 | ></my-video-actions-dropdown> | 140 | ></my-video-actions-dropdown> |
141 | </ng-container> | 141 | </ng-container> |
142 | </div> | 142 | </div> |
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss index 712022141..e198a8bb0 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.scss +++ b/client/src/app/+videos/+video-watch/video-watch.component.scss | |||
@@ -27,14 +27,14 @@ $video-info-margin-left: 44px; | |||
27 | flex-direction: column; | 27 | flex-direction: column; |
28 | justify-content: center; | 28 | justify-content: center; |
29 | 29 | ||
30 | $height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); | ||
31 | |||
30 | #videojs-wrapper { | 32 | #videojs-wrapper { |
31 | width: 100%; | 33 | width: 100%; |
32 | height: auto; | 34 | height: $height; |
33 | } | 35 | } |
34 | 36 | ||
35 | ::ng-deep .video-js { | 37 | ::ng-deep .video-js { |
36 | $height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); | ||
37 | |||
38 | height: $height; | 38 | height: $height; |
39 | width: 100%; | 39 | width: 100%; |
40 | max-width: initial; | 40 | max-width: initial; |
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 9a3439731..48623cae0 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts | |||
@@ -21,7 +21,7 @@ import { isXPercentInViewport, scrollToTop } from '@app/helpers' | |||
21 | import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main' | 21 | import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main' |
22 | import { VideoShareComponent } from '@app/shared/shared-share-modal' | 22 | import { VideoShareComponent } from '@app/shared/shared-share-modal' |
23 | import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' | 23 | import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' |
24 | import { VideoDownloadComponent } from '@app/shared/shared-video-miniature' | 24 | import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature' |
25 | import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' | 25 | import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' |
26 | import { MetaService } from '@ngx-meta/core' | 26 | import { MetaService } from '@ngx-meta/core' |
27 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' | 27 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' |
@@ -82,6 +82,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
82 | tooltipSupport = '' | 82 | tooltipSupport = '' |
83 | tooltipSaveToPlaylist = '' | 83 | tooltipSaveToPlaylist = '' |
84 | 84 | ||
85 | videoActionsOptions: VideoActionsDisplayType = { | ||
86 | playlist: false, | ||
87 | download: true, | ||
88 | update: true, | ||
89 | blacklist: true, | ||
90 | delete: true, | ||
91 | report: true, | ||
92 | duplicate: true, | ||
93 | mute: true, | ||
94 | liveInfo: true | ||
95 | } | ||
96 | |||
85 | private nextVideoUuid = '' | 97 | private nextVideoUuid = '' |
86 | private nextVideoTitle = '' | 98 | private nextVideoTitle = '' |
87 | private currentTime: number | 99 | private currentTime: number |