From 58ed68d8c3f78c7e5a867d74f9b56a2f8ad97b21 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Tue, 31 Jul 2018 14:06:50 -0400
Subject: [PATCH] position tracking clean up
---
src/renderer/component/fileViewer/index.js | 2 +-
src/renderer/component/fileViewer/internal/player.jsx | 4 +++-
src/renderer/component/fileViewer/view.jsx | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/renderer/component/fileViewer/index.js b/src/renderer/component/fileViewer/index.js
index 005dc45f5..1ee003ee7 100644
--- a/src/renderer/component/fileViewer/index.js
+++ b/src/renderer/component/fileViewer/index.js
@@ -29,7 +29,7 @@ const select = (state, props) => ({
playingUri: selectPlayingUri(state),
contentType: makeSelectContentTypeForUri(props.uri)(state),
volume: selectVolume(state),
- playbackPosition: makeSelectContentPositionForUri(props.uri)(state),
+ position: makeSelectContentPositionForUri(props.uri)(state),
autoplay: makeSelectClientSetting(settings.AUTOPLAY)(state),
searchBarFocused: selectSearchBarFocused(state),
fileInfoErrors: selectFileInfoErrors(state),
diff --git a/src/renderer/component/fileViewer/internal/player.jsx b/src/renderer/component/fileViewer/internal/player.jsx
index 50ba340aa..10b47fd0e 100644
--- a/src/renderer/component/fileViewer/internal/player.jsx
+++ b/src/renderer/component/fileViewer/internal/player.jsx
@@ -88,7 +88,9 @@ class MediaPlayer extends React.PureComponent {
document.addEventListener('keydown', this.togglePlayListener);
const mediaElement = this.media.children[0];
if (mediaElement) {
- mediaElement.currentTime = position || 0;
+ if (position) {
+ mediaElement.currentTime = position;
+ }
mediaElement.addEventListener('timeupdate', () =>
this.props.savePosition(
claim.claim_id,
diff --git a/src/renderer/component/fileViewer/view.jsx b/src/renderer/component/fileViewer/view.jsx
index 7fa36ffee..1e226ef5e 100644
--- a/src/renderer/component/fileViewer/view.jsx
+++ b/src/renderer/component/fileViewer/view.jsx
@@ -35,7 +35,7 @@ type Props = {
claim: Claim,
uri: string,
savePosition: (string, string, number) => void,
- playbackPosition: ?number,
+ position: ?number,
className: ?string,
obscureNsfw: boolean,
play: string => void,
@@ -200,7 +200,7 @@ class FileViewer extends React.PureComponent<Props> {
claim,
uri,
savePosition,
- playbackPosition,
+ position,
className,
obscureNsfw,
mediaType,
@@ -249,7 +249,7 @@ class FileViewer extends React.PureComponent<Props> {
savePosition={savePosition}
claim={claim}
uri={uri}
- position={playbackPosition}
+ position={position}
playingUri={playingUri}
/>
)}