diff options
Diffstat (limited to 'client/src/app/+videos')
-rw-r--r-- | client/src/app/+videos/+video-watch/video-watch.component.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts index 571d1e99a..075f70f56 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts | |||
@@ -29,7 +29,7 @@ import { MetaService } from '@ngx-meta/core' | |||
29 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' | 29 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' |
30 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' | 30 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' |
31 | import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models' | 31 | import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models' |
32 | import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage' | 32 | import { cleanupVideoWatch, getStoredP2PEnabled, getStoredTheater, getStoredVideoWatchHistory } from '../../../assets/player/peertube-player-local-storage' |
33 | import { | 33 | import { |
34 | CustomizationOptions, | 34 | CustomizationOptions, |
35 | P2PMediaLoaderOptions, | 35 | P2PMediaLoaderOptions, |
@@ -195,6 +195,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
195 | this.theaterEnabled = getStoredTheater() | 195 | this.theaterEnabled = getStoredTheater() |
196 | 196 | ||
197 | this.hooks.runAction('action:video-watch.init', 'video-watch') | 197 | this.hooks.runAction('action:video-watch.init', 'video-watch') |
198 | |||
199 | setTimeout(cleanupVideoWatch, 1500) // Run in timeout to ensure we're not blocking the UI | ||
198 | } | 200 | } |
199 | 201 | ||
200 | ngOnDestroy () { | 202 | ngOnDestroy () { |
@@ -768,9 +770,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
768 | const getStartTime = () => { | 770 | const getStartTime = () => { |
769 | const byUrl = urlOptions.startTime !== undefined | 771 | const byUrl = urlOptions.startTime !== undefined |
770 | const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined) | 772 | const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined) |
773 | const byLocalStorage = getStoredVideoWatchHistory(video.uuid) | ||
771 | 774 | ||
772 | if (byUrl) return timeToInt(urlOptions.startTime) | 775 | if (byUrl) return timeToInt(urlOptions.startTime) |
773 | if (byHistory) return video.userHistory.currentTime | 776 | if (byHistory) return video.userHistory.currentTime |
777 | if (byLocalStorage) return byLocalStorage.duration | ||
774 | 778 | ||
775 | return 0 | 779 | return 0 |
776 | } | 780 | } |
@@ -828,7 +832,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
828 | 832 | ||
829 | serverUrl: environment.apiUrl, | 833 | serverUrl: environment.apiUrl, |
830 | 834 | ||
831 | videoCaptions: playerCaptions | 835 | videoCaptions: playerCaptions, |
836 | |||
837 | videoUUID: video.uuid | ||
832 | }, | 838 | }, |
833 | 839 | ||
834 | webtorrent: { | 840 | webtorrent: { |