mirror of
https://github.com/TeamPiped/Piped.git
synced 2024-08-14 23:57:27 +00:00
fix some issues caused by merging with upstream
This commit is contained in:
parent
2612c8e791
commit
5e3d8e8401
1 changed files with 7 additions and 7 deletions
|
@ -79,7 +79,7 @@
|
||||||
(this.getPreferenceBoolean('watchHistory', false) ||
|
(this.getPreferenceBoolean('watchHistory', false) ||
|
||||||
this.getPreferenceBoolean('hideWatched', false))
|
this.getPreferenceBoolean('hideWatched', false))
|
||||||
"
|
"
|
||||||
@click="toggleWatched(video.url.substr(-11))"
|
@click="toggleWatched(item.url.substr(-11))"
|
||||||
ref="watchButton"
|
ref="watchButton"
|
||||||
>
|
>
|
||||||
<font-awesome-icon icon="eye-slash" :title="$t('actions.mark_as_unwatched')" v-if="item.watched" />
|
<font-awesome-icon icon="eye-slash" :title="$t('actions.mark_as_unwatched')" v-if="item.watched" />
|
||||||
|
@ -220,16 +220,16 @@ export default {
|
||||||
// Should match WatchVideo.vue
|
// Should match WatchVideo.vue
|
||||||
video = {
|
video = {
|
||||||
videoId: videoId,
|
videoId: videoId,
|
||||||
title: instance.video.title,
|
title: instance.item.title,
|
||||||
duration: instance.video.duration,
|
duration: instance.item.duration,
|
||||||
thumbnail: instance.video.thumbnailUrl,
|
thumbnail: instance.item.thumbnailUrl,
|
||||||
uploaderUrl: instance.video.uploaderUrl,
|
uploaderUrl: instance.item.uploaderUrl,
|
||||||
uploaderName: instance.video.uploader,
|
uploaderName: instance.item.uploader,
|
||||||
watchedAt: Date.now(),
|
watchedAt: Date.now(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// Set time to end for shouldShowVideo
|
// Set time to end for shouldShowVideo
|
||||||
video.currentTime = instance.video.duration;
|
video.currentTime = instance.item.duration;
|
||||||
// Save
|
// Save
|
||||||
store.put(video);
|
store.put(video);
|
||||||
// Disappear if hideWatched is on
|
// Disappear if hideWatched is on
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue