aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/shared/video-playlist/video-add-to-playlist.component.scss21
-rw-r--r--client/src/app/shared/video-playlist/video-add-to-playlist.component.ts5
-rw-r--r--client/src/app/shared/video-playlist/video-playlist.service.ts2
3 files changed, 9 insertions, 19 deletions
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
index 5f9bb51a7..f1b6cd601 100644
--- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
+++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
@@ -1,10 +1,14 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3 3
4.header { 4.header,
5 min-width: 240px; 5.dropdown-item,
6.input-container {
6 padding: 6px 24px 10px 24px; 7 padding: 6px 24px 10px 24px;
8}
7 9
10.header {
11 min-width: 240px;
8 margin-bottom: 10px; 12 margin-bottom: 10px;
9 border-bottom: 1px solid $separator-border-color; 13 border-bottom: 1px solid $separator-border-color;
10 14
@@ -44,24 +48,11 @@
44 } 48 }
45} 49}
46 50
47.dropdown-item {
48 padding: 6px 24px;
49}
50
51.playlists { 51.playlists {
52 max-height: 180px; 52 max-height: 180px;
53 overflow-y: auto; 53 overflow-y: auto;
54} 54}
55 55
56.input-container {
57 display: flex;
58
59 input {
60 flex-grow: 1;
61 margin: 0 15px 10px 15px;
62 }
63}
64
65.playlist { 56.playlist {
66 display: flex; 57 display: flex;
67 cursor: pointer; 58 cursor: pointer;
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.ts b/client/src/app/shared/video-playlist/video-add-to-playlist.component.ts
index e60a8381d..0c593a79a 100644
--- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.ts
+++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.ts
@@ -1,5 +1,5 @@
1import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core' 1import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'
2import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service' 2import { CachedPlaylist, VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service'
3import { AuthService, Notifier } from '@app/core' 3import { AuthService, Notifier } from '@app/core'
4import { Subject, Subscription } from 'rxjs' 4import { Subject, Subscription } from 'rxjs'
5import { debounceTime, filter } from 'rxjs/operators' 5import { debounceTime, filter } from 'rxjs/operators'
@@ -7,7 +7,6 @@ import { Video, VideoPlaylistCreate, VideoPlaylistElementCreate, VideoPlaylistPr
7import { FormReactive, FormValidatorService, VideoPlaylistValidatorsService } from '@app/shared/forms' 7import { FormReactive, FormValidatorService, VideoPlaylistValidatorsService } from '@app/shared/forms'
8import { I18n } from '@ngx-translate/i18n-polyfill' 8import { I18n } from '@ngx-translate/i18n-polyfill'
9import { secondsToTime } from '../../../assets/player/utils' 9import { secondsToTime } from '../../../assets/player/utils'
10import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model'
11import * as debug from 'debug' 10import * as debug from 'debug'
12import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook' 11import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
13import { VideoExistInPlaylist } from '@shared/models/videos/playlist/video-exist-in-playlist.model' 12import { VideoExistInPlaylist } from '@shared/models/videos/playlist/video-exist-in-playlist.model'
@@ -50,7 +49,7 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
50 private disabled = false 49 private disabled = false
51 50
52 private listenToPlaylistChangeSub: Subscription 51 private listenToPlaylistChangeSub: Subscription
53 private playlistsData: VideoPlaylist[] = [] 52 private playlistsData: CachedPlaylist[] = []
54 53
55 constructor ( 54 constructor (
56 protected formValidatorService: FormValidatorService, 55 protected formValidatorService: FormValidatorService,
diff --git a/client/src/app/shared/video-playlist/video-playlist.service.ts b/client/src/app/shared/video-playlist/video-playlist.service.ts
index c5b87fc11..7eddf81e1 100644
--- a/client/src/app/shared/video-playlist/video-playlist.service.ts
+++ b/client/src/app/shared/video-playlist/video-playlist.service.ts
@@ -26,7 +26,7 @@ import * as debug from 'debug'
26 26
27const logger = debug('peertube:playlists:VideoPlaylistService') 27const logger = debug('peertube:playlists:VideoPlaylistService')
28 28
29type CachedPlaylist = VideoPlaylist | { id: number, displayName: string } 29export type CachedPlaylist = VideoPlaylist | { id: number, displayName: string }
30 30
31@Injectable() 31@Injectable()
32export class VideoPlaylistService { 32export class VideoPlaylistService {