diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /client/src/assets/player/utils.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'client/src/assets/player/utils.ts')
| -rw-r--r-- | client/src/assets/player/utils.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts index c87287482..8b9f34b99 100644 --- a/client/src/assets/player/utils.ts +++ b/client/src/assets/player/utils.ts | |||
| @@ -39,6 +39,7 @@ function buildVideoLink (time?: number, url?: string) { | |||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | function timeToInt (time: number | string) { | 41 | function timeToInt (time: number | string) { |
| 42 | if (!time) return 0 | ||
| 42 | if (typeof time === 'number') return time | 43 | if (typeof time === 'number') return time |
| 43 | 44 | ||
| 44 | const reg = /^((\d+)h)?((\d+)m)?((\d+)s?)?$/ | 45 | const reg = /^((\d+)h)?((\d+)m)?((\d+)s?)?$/ |