mirror of https://github.com/Chocobozzz/PeerTube
Fix client lint
parent
99b757488c
commit
7dcd7d8140
|
@ -143,7 +143,7 @@ export class VideoAddComponent implements OnInit, CanComponentDeactivate {
|
||||||
return text
|
return text
|
||||||
}
|
}
|
||||||
|
|
||||||
canDeactivate (): { canDeactivate: boolean, text?: string} {
|
canDeactivate (): { canDeactivate: boolean, text?: string } {
|
||||||
if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate()
|
if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate()
|
||||||
if (this.secondStepType === 'import-url') return this.videoImportUrl.canDeactivate()
|
if (this.secondStepType === 'import-url') return this.videoImportUrl.canDeactivate()
|
||||||
if (this.secondStepType === 'import-torrent') return this.videoImportTorrent.canDeactivate()
|
if (this.secondStepType === 'import-torrent') return this.videoImportTorrent.canDeactivate()
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
import { Observable, of as ofObservable, timer as observableTimer } from 'rxjs'
|
import { Observable, of as ofObservable, timer as observableTimer } from 'rxjs'
|
||||||
import { switchMap } from 'rxjs/operators'
|
import { switchMap } from 'rxjs/operators'
|
||||||
import { PreloadingStrategy, Route } from '@angular/router'
|
|
||||||
import { Injectable } from '@angular/core'
|
import { Injectable } from '@angular/core'
|
||||||
|
import { PreloadingStrategy, Route } from '@angular/router'
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class PreloadSelectedModulesList implements PreloadingStrategy {
|
export class PreloadSelectedModulesList implements PreloadingStrategy {
|
||||||
|
|
||||||
preload (route: Route, load: () => Observable<any>): Observable<any> {
|
preload (route: Route, load: () => Observable<any>): Observable<any> {
|
||||||
if (!route.data || !route.data.preload) return ofObservable(null)
|
if (!route.data?.preload) return ofObservable(null)
|
||||||
|
|
||||||
if (typeof route.data.preload === 'number') {
|
if (typeof route.data.preload === 'number') {
|
||||||
return observableTimer(route.data.preload).pipe(switchMap(() => load()))
|
return observableTimer(route.data.preload).pipe(switchMap(() => load()))
|
||||||
|
|
|
@ -13,11 +13,11 @@ export class NumberFormatterPipe implements PipeTransform {
|
||||||
static getDecimalForNumber (x: number, n = 1) {
|
static getDecimalForNumber (x: number, n = 1) {
|
||||||
const v = x.toString().split('.')
|
const v = x.toString().split('.')
|
||||||
const f = v[1] || ''
|
const f = v[1] || ''
|
||||||
if (f.length > n) return +f.substr(0, n)
|
if (f.length > n) return +f.substring(0, n)
|
||||||
return +f
|
return +f
|
||||||
}
|
}
|
||||||
|
|
||||||
private dictionary: Array<{max: number, type: string}> = [
|
private dictionary: Array<{ max: number, type: string }> = [
|
||||||
{ max: 1000, type: '' },
|
{ max: 1000, type: '' },
|
||||||
{ max: 1000000, type: 'K' },
|
{ max: 1000000, type: 'K' },
|
||||||
{ max: 1000000000, type: 'M' }
|
{ max: 1000000000, type: 'M' }
|
||||||
|
|
|
@ -32,7 +32,7 @@ export interface ListOverflowItem {
|
||||||
})
|
})
|
||||||
export class ListOverflowComponent<T extends ListOverflowItem> implements AfterViewInit {
|
export class ListOverflowComponent<T extends ListOverflowItem> implements AfterViewInit {
|
||||||
@Input() items: T[]
|
@Input() items: T[]
|
||||||
@Input() itemTemplate: TemplateRef<{item: T}>
|
@Input() itemTemplate: TemplateRef<{ item: T }>
|
||||||
|
|
||||||
@ViewChild('modal', { static: true }) modal: ElementRef
|
@ViewChild('modal', { static: true }) modal: ElementRef
|
||||||
@ViewChild('itemsParent', { static: true }) parent: ElementRef<HTMLDivElement>
|
@ViewChild('itemsParent', { static: true }) parent: ElementRef<HTMLDivElement>
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { VideoCaption, VideoFile, VideoPrivacy } from '@shared/models'
|
||||||
import { BytesPipe, NumberFormatterPipe, VideoDetails, VideoFileTokenService, VideoService } from '../shared-main'
|
import { BytesPipe, NumberFormatterPipe, VideoDetails, VideoFileTokenService, VideoService } from '../shared-main'
|
||||||
|
|
||||||
type DownloadType = 'video' | 'subtitles'
|
type DownloadType = 'video' | 'subtitles'
|
||||||
type FileMetadata = { [key: string]: { label: string, value: string }}
|
type FileMetadata = { [key: string]: { label: string, value: string } }
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'my-video-download',
|
selector: 'my-video-download',
|
||||||
|
|
|
@ -74,7 +74,7 @@ export class VideoPlaylistElementMiniatureComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
buildRouterQuery () {
|
buildRouterQuery () {
|
||||||
if (!this.playlistElement || !this.playlistElement.video) return {}
|
if (!this.playlistElement?.video) return {}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
playlistPosition: this.playlistElement.position,
|
playlistPosition: this.playlistElement.position,
|
||||||
|
|
|
@ -32,7 +32,7 @@ function isSafari () {
|
||||||
|
|
||||||
// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts
|
// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts
|
||||||
// Don't import all Angular stuff, just copy the code with shame
|
// Don't import all Angular stuff, just copy the code with shame
|
||||||
const dictionaryBytes: Array<{max: number, type: string}> = [
|
const dictionaryBytes: Array<{ max: number, type: string }> = [
|
||||||
{ max: 1024, type: 'B' },
|
{ max: 1024, type: 'B' },
|
||||||
{ max: 1048576, type: 'KB' },
|
{ max: 1048576, type: 'KB' },
|
||||||
{ max: 1073741824, type: 'MB' },
|
{ max: 1073741824, type: 'MB' },
|
||||||
|
|
|
@ -32,7 +32,7 @@ export class PlaylistTracker {
|
||||||
|
|
||||||
const next = this.playlistElements.find(e => e.position === position)
|
const next = this.playlistElements.find(e => e.position === position)
|
||||||
|
|
||||||
if (!next || !next.video) {
|
if (!next?.video) {
|
||||||
return this.getNextPlaylistElement(position + 1)
|
return this.getNextPlaylistElement(position + 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ export class PlaylistTracker {
|
||||||
|
|
||||||
const prev = this.playlistElements.find(e => e.position === position)
|
const prev = this.playlistElements.find(e => e.position === position)
|
||||||
|
|
||||||
if (!prev || !prev.video) {
|
if (!prev?.video) {
|
||||||
return this.getNextPlaylistElement(position - 1)
|
return this.getNextPlaylistElement(position - 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ export class PlaylistTracker {
|
||||||
|
|
||||||
setPosition (position: number) {
|
setPosition (position: number) {
|
||||||
this.currentPlaylistElement = this.playlistElements.find(e => e.position === position)
|
this.currentPlaylistElement = this.playlistElements.find(e => e.position === position)
|
||||||
if (!this.currentPlaylistElement || !this.currentPlaylistElement.video) {
|
if (!this.currentPlaylistElement?.video) {
|
||||||
logger.error('Current playlist element is not valid.', this.currentPlaylistElement)
|
logger.error('Current playlist element is not valid.', this.currentPlaylistElement)
|
||||||
this.currentPlaylistElement = this.getNextPlaylistElement()
|
this.currentPlaylistElement = this.getNextPlaylistElement()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"extends": "../../../tsconfig.json",
|
"extends": "../../../tsconfig.json",
|
||||||
"include": [
|
"include": [
|
||||||
"src/standalone/videos/embed.ts",
|
"./embed.ts",
|
||||||
"src/standalone/videos/test-embed.ts"
|
"./test-embed.ts"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue