diff options
Diffstat (limited to 'client/src/app')
-rw-r--r-- | client/src/app/shared/video/video-actions-dropdown.component.html | 2 | ||||
-rw-r--r-- | client/src/app/shared/video/video-actions-dropdown.component.ts | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.html b/client/src/app/shared/video/video-actions-dropdown.component.html index 300fe318a..ec03fa55d 100644 --- a/client/src/app/shared/video/video-actions-dropdown.component.html +++ b/client/src/app/shared/video/video-actions-dropdown.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | </div> | 11 | </div> |
12 | 12 | ||
13 | <my-action-dropdown | 13 | <my-action-dropdown |
14 | [actions]="videoActions" [label]="label" [entry]="{ video: video }" (mouseenter)="loadDropdownInformation()" | 14 | [actions]="videoActions" [label]="label" [entry]="{ video: video }" (click)="loadDropdownInformation()" |
15 | [buttonSize]="buttonSize" [placement]="placement" [buttonDirection]="buttonDirection" [buttonStyled]="buttonStyled" | 15 | [buttonSize]="buttonSize" [placement]="placement" [buttonDirection]="buttonDirection" [buttonStyled]="buttonStyled" |
16 | ></my-action-dropdown> | 16 | ></my-action-dropdown> |
17 | 17 | ||
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts index c1da0eba6..ee2f44f9e 100644 --- a/client/src/app/shared/video/video-actions-dropdown.component.ts +++ b/client/src/app/shared/video/video-actions-dropdown.component.ts | |||
@@ -28,7 +28,7 @@ export type VideoActionsDisplayType = { | |||
28 | templateUrl: './video-actions-dropdown.component.html', | 28 | templateUrl: './video-actions-dropdown.component.html', |
29 | styleUrls: [ './video-actions-dropdown.component.scss' ] | 29 | styleUrls: [ './video-actions-dropdown.component.scss' ] |
30 | }) | 30 | }) |
31 | export class VideoActionsDropdownComponent implements AfterViewInit, OnChanges { | 31 | export class VideoActionsDropdownComponent implements OnChanges { |
32 | @ViewChild('playlistDropdown') playlistDropdown: NgbDropdown | 32 | @ViewChild('playlistDropdown') playlistDropdown: NgbDropdown |
33 | @ViewChild('playlistAdd') playlistAdd: VideoAddToPlaylistComponent | 33 | @ViewChild('playlistAdd') playlistAdd: VideoAddToPlaylistComponent |
34 | 34 | ||
@@ -78,13 +78,6 @@ export class VideoActionsDropdownComponent implements AfterViewInit, OnChanges { | |||
78 | return this.authService.getUser() | 78 | return this.authService.getUser() |
79 | } | 79 | } |
80 | 80 | ||
81 | ngAfterViewInit () { | ||
82 | // We rely on mouseenter to lazy load actions | ||
83 | if (this.screenService.isInTouchScreen()) { | ||
84 | this.loadDropdownInformation() | ||
85 | } | ||
86 | } | ||
87 | |||
88 | ngOnChanges () { | 81 | ngOnChanges () { |
89 | this.buildActions() | 82 | this.buildActions() |
90 | } | 83 | } |