mirror of https://github.com/Chocobozzz/PeerTube
Fix input mask with 10h+ videos
parent
b25a6d0560
commit
3608eb4f1e
|
@ -1,5 +1,5 @@
|
||||||
<p-inputMask
|
<p-inputMask
|
||||||
[disabled]="disabled" [(ngModel)]="timestampString" (onBlur)="onBlur()"
|
[disabled]="disabled" [(ngModel)]="timestampString" (onBlur)="onBlur()"
|
||||||
[ngClass]="{ 'border-disabled': disableBorder }"
|
[ngClass]="{ 'border-disabled': disableBorder }"
|
||||||
mask="9:99:99" slotChar="0" (ngModelChange)="onModelChange()" [inputId]="inputName"
|
mask="99:99:99" slotChar="0" (ngModelChange)="onModelChange()" [inputId]="inputName"
|
||||||
></p-inputMask>
|
></p-inputMask>
|
||||||
|
|
|
@ -26,6 +26,8 @@ p-inputmask {
|
||||||
&:not(.border-disabled) {
|
&:not(.border-disabled) {
|
||||||
::ng-deep input {
|
::ng-deep input {
|
||||||
@include peertube-input-text(80px);
|
@include peertube-input-text(80px);
|
||||||
|
|
||||||
|
padding: 3px 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,8 @@ export class TimestampInputComponent implements ControlValueAccessor, OnInit {
|
||||||
writeValue (timestamp: number) {
|
writeValue (timestamp: number) {
|
||||||
this.timestamp = timestamp
|
this.timestamp = timestamp
|
||||||
|
|
||||||
this.timestampString = secondsToTime(this.timestamp, true, ':')
|
this.timestampString = secondsToTime({ seconds: this.timestamp, fullFormat: true, symbol: ':' })
|
||||||
|
console.log(this.timestampString)
|
||||||
}
|
}
|
||||||
|
|
||||||
registerOnChange (fn: (_: any) => void) {
|
registerOnChange (fn: (_: any) => void) {
|
||||||
|
|
|
@ -144,8 +144,8 @@ export class VideoPlaylistElementMiniatureComponent implements OnInit {
|
||||||
const start = playlistElement.startTimestamp
|
const start = playlistElement.startTimestamp
|
||||||
const stop = playlistElement.stopTimestamp
|
const stop = playlistElement.stopTimestamp
|
||||||
|
|
||||||
const startFormatted = secondsToTime(start, true, ':')
|
const startFormatted = secondsToTime({ seconds: start, fullFormat: true, symbol: ':' })
|
||||||
const stopFormatted = secondsToTime(stop, true, ':')
|
const stopFormatted = secondsToTime({ seconds: stop, fullFormat: true, symbol: ':' })
|
||||||
|
|
||||||
if (start === null && stop === null) return ''
|
if (start === null && stop === null) return ''
|
||||||
|
|
||||||
|
|
|
@ -83,29 +83,46 @@ function timeToInt (time: number | string) {
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
function secondsToTime (seconds: number, full = false, symbol?: string) {
|
function secondsToTime (options: {
|
||||||
|
seconds: number
|
||||||
|
fullFormat?: boolean // default false
|
||||||
|
symbol?: string
|
||||||
|
} | number) {
|
||||||
|
let seconds: number
|
||||||
|
let fullFormat = false
|
||||||
|
let symbol: string
|
||||||
|
|
||||||
|
if (typeof options === 'number') {
|
||||||
|
seconds = options
|
||||||
|
} else {
|
||||||
|
seconds = options.seconds
|
||||||
|
fullFormat = options.fullFormat ?? false
|
||||||
|
symbol = options.symbol
|
||||||
|
}
|
||||||
|
|
||||||
let time = ''
|
let time = ''
|
||||||
|
|
||||||
if (seconds === 0 && !full) return '0s'
|
if (seconds === 0 && !fullFormat) return '0s'
|
||||||
|
|
||||||
const hourSymbol = (symbol || 'h')
|
const hourSymbol = (symbol || 'h')
|
||||||
const minuteSymbol = (symbol || 'm')
|
const minuteSymbol = (symbol || 'm')
|
||||||
const secondsSymbol = full ? '' : 's'
|
const secondsSymbol = fullFormat ? '' : 's'
|
||||||
|
|
||||||
const hours = Math.floor(seconds / 3600)
|
const hours = Math.floor(seconds / 3600)
|
||||||
if (hours >= 1) time = hours + hourSymbol
|
if (hours >= 1 && hours < 10 && fullFormat) time = '0' + hours + hourSymbol
|
||||||
else if (full) time = '0' + hourSymbol
|
else if (hours >= 1) time = hours + hourSymbol
|
||||||
|
else if (fullFormat) time = '00' + hourSymbol
|
||||||
|
|
||||||
seconds %= 3600
|
seconds %= 3600
|
||||||
const minutes = Math.floor(seconds / 60)
|
const minutes = Math.floor(seconds / 60)
|
||||||
if (minutes >= 1 && minutes < 10 && full) time += '0' + minutes + minuteSymbol
|
if (minutes >= 1 && minutes < 10 && fullFormat) time += '0' + minutes + minuteSymbol
|
||||||
else if (minutes >= 1) time += minutes + minuteSymbol
|
else if (minutes >= 1) time += minutes + minuteSymbol
|
||||||
else if (full) time += '00' + minuteSymbol
|
else if (fullFormat) time += '00' + minuteSymbol
|
||||||
|
|
||||||
seconds %= 60
|
seconds %= 60
|
||||||
if (seconds >= 1 && seconds < 10 && full) time += '0' + seconds + secondsSymbol
|
if (seconds >= 1 && seconds < 10 && fullFormat) time += '0' + seconds + secondsSymbol
|
||||||
else if (seconds >= 1) time += seconds + secondsSymbol
|
else if (seconds >= 1) time += seconds + secondsSymbol
|
||||||
else if (full) time += '00'
|
else if (fullFormat) time += '00'
|
||||||
|
|
||||||
return time
|
return time
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue