1
0
Fork 0

Add edit button to scroll watch playlist on touchscreens

This commit is contained in:
kimsible 2020-04-24 18:59:10 +02:00 committed by Chocobozzz
parent 610d0be13b
commit bedf0e6073
4 changed files with 94 additions and 5 deletions

View file

@ -36,7 +36,9 @@
</div>
</a>
<div *ngIf="owned" class="more" ngbDropdown #moreDropdown="ngbDropdown" placement="bottom-right"
<my-edit-button *ngIf="owned && touchScreenEditButton" [routerLink]="[ '/my-account', 'video-playlists', playlist.uuid ]"></my-edit-button>
<div *ngIf="owned" class="more" ngbDropdown #moreDropdown="ngbDropdown" placement="bottom auto"
(openChange)="onDropdownOpenChange()" autoClose="outside"
>
<my-global-icon iconName="more-vertical" ngbDropdownToggle role="button" class="icon-more" (click)="$event.preventDefault()"></my-global-icon>
@ -82,8 +84,9 @@
</ng-container>
<span class="dropdown-item" (click)="removeFromPlaylist(playlistElement)">
<my-global-icon iconName="delete"></my-global-icon> <ng-container i18n>Delete from {{ playlist?.displayName }}</ng-container>
</span>
<my-global-icon iconName="delete"></my-global-icon>
<ng-container i18n>Delete from {{ playlist?.displayName }}</ng-container>
</span>
</div>
</div>
</div>

View file

@ -88,12 +88,15 @@ my-video-thumbnail,
@include ellipsis;
}
.more {
.more, my-edit-button {
justify-self: flex-end;
margin-left: auto;
cursor: pointer;
opacity: 0;
min-width: 24px;
}
.more {
opacity: 0;
&.show {
opacity: 1;
@ -132,3 +135,84 @@ my-video-thumbnail,
}
}
}
@mixin more-dropdown-control {
.video {
my-edit-button {
display: none;
+ .more {
display: inline-flex;
}
}
}
}
@mixin edit-button-control {
.video {
my-edit-button {
display: none;
}
&.playing {
my-edit-button {
display: inline-flex;
height: max-content;
}
}
my-edit-button + .more {
display: none;
}
}
}
@mixin edit-button-in-mobile-view {
.video {
my-edit-button {
::ng-deep .action-button-edit {
padding: 0 13px;
.button-label {
display: none;
}
}
}
}
}
@media screen and (min-width: $small-view) {
:host-context(.expanded) {
@include more-dropdown-control();
}
}
@media screen and (max-width: $small-view) {
:host-context(.expanded) {
@include edit-button-control();
}
}
@media screen and (max-width: $mobile-view) {
:host-context(.expanded) {
@include edit-button-in-mobile-view();
}
}
@media screen and (min-width: #{$small-view + $menu-width}) {
:host-context(.main-col:not(.expanded)) {
@include more-dropdown-control();
}
}
@media screen and (max-width: #{$small-view + $menu-width}) {
:host-context(.main-col:not(.expanded)) {
@include edit-button-control();
}
}
@media screen and (max-width: #{$mobile-view + $menu-width}) {
:host-context(.main-col:not(.expanded)) {
@include edit-button-in-mobile-view();
}
}

View file

@ -27,6 +27,7 @@ export class VideoPlaylistElementMiniatureComponent implements OnInit {
@Input() rowLink = false
@Input() accountLink = true
@Input() position: number // Keep this property because we're in the OnPush change detection strategy
@Input() touchScreenEditButton = false
@Output() elementRemoved = new EventEmitter<VideoPlaylistElement>()

View file

@ -40,6 +40,7 @@
<my-video-playlist-element-miniature
[playlistElement]="playlistElement" [playlist]="playlist" [owned]="isPlaylistOwned()" (elementRemoved)="onElementRemoved($event)"
[playing]="currentPlaylistPosition === playlistElement.position" [accountLink]="false" [position]="playlistElement.position"
[touchScreenEditButton]="true"
></my-video-playlist-element-miniature>
</div>
</div>