From c0cce9e35ff5e0c6a1e9b57ae7a7519c21c172cc Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Mon, 14 Oct 2024 16:04:50 -0500
Subject: [PATCH] Remove now-redundant playlist pause feature

---
 .../watch-video-playlist.js                   | 11 ----------
 .../watch-video-playlist.vue                  | 12 -----------
 src/renderer/views/Watch/Watch.js             | 21 +------------------
 static/locales/en-GB.yaml                     |  4 ----
 static/locales/en-US.yaml                     |  2 --
 5 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index bfe449b6eb0ec..3bf5e39b284fd 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -48,7 +48,6 @@ export default defineComponent({
       shuffleEnabled: false,
       loopEnabled: false,
       reversePlaylist: false,
-      pauseOnCurrentVideo: false,
       prevVideoBeforeDeletion: null,
       channelName: '',
       channelId: '',
@@ -294,16 +293,6 @@ export default defineComponent({
       })
     },
 
-    togglePauseOnCurrentVideo: function () {
-      if (this.pauseOnCurrentVideo) {
-        this.pauseOnCurrentVideo = false
-        showToast(this.$t('Playlist will not pause when current video is finished'))
-      } else {
-        this.pauseOnCurrentVideo = true
-        showToast(this.$t('Playlist will pause when current video is finished'))
-      }
-    },
-
     playNextVideo: function () {
       const playlistInfo = {
         playlistId: this.playlistId,
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 85abbd3efb880..f3d01b0efd1e9 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -105,18 +105,6 @@
           @keydown.enter.prevent="playNextVideo"
           @keydown.space.prevent="playNextVideo"
         />
-        <font-awesome-icon
-          class="playlistIcon"
-          :class="{ playlistIconActive: pauseOnCurrentVideo }"
-          :icon="['fas', 'pause']"
-          :title="$t('Video.Pause on Current Video')"
-          role="button"
-          tabindex="0"
-          :aria-pressed="pauseOnCurrentVideo"
-          @click="togglePauseOnCurrentVideo"
-          @keydown.enter.prevent="togglePauseOnCurrentVideo"
-          @keydown.space.prevent="togglePauseOnCurrentVideo"
-        />
       </p>
       <div
         v-if="!isLoading"
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 40fa70c72fdff..a1d71c3f5ea77 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -205,7 +205,7 @@ export default defineComponent({
     },
     autoplayPossible: function () {
       return (!this.watchingPlaylist && !this.hideRecommendedVideos && !!this.nextRecommendedVideo) ||
-      (this.watchingPlaylist && !this.getPlaylistPauseOnCurrent() && !this.$refs.watchVideoPlaylist?.shouldStopDueToPlaylistEnd)
+      (this.watchingPlaylist && !this.$refs.watchVideoPlaylist?.shouldStopDueToPlaylistEnd)
     },
     currentLocale: function () {
       return this.$i18n.locale
@@ -1083,10 +1083,6 @@ export default defineComponent({
     },
 
     checkIfPlaylist: function () {
-      // On the off chance that user selected pause on current video
-      // Then clicks on another video in the playlist
-      this.disablePlaylistPauseOnCurrent()
-
       if (this.$route.query == null) {
         this.watchingPlaylist = false
         return
@@ -1198,11 +1194,6 @@ export default defineComponent({
         return
       }
 
-      if (this.watchingPlaylist && this.getPlaylistPauseOnCurrent()) {
-        this.disablePlaylistPauseOnCurrent()
-        return
-      }
-
       if (this.watchingPlaylist && this.$refs.watchVideoPlaylist?.shouldStopDueToPlaylistEnd) {
         // Let `watchVideoPlaylist` handle end of playlist, no countdown needed
         this.$refs.watchVideoPlaylist.playNextVideo()
@@ -1606,16 +1597,6 @@ export default defineComponent({
       return this.$refs.watchVideoPlaylist ? this.$refs.watchVideoPlaylist.loopEnabled : false
     },
 
-    getPlaylistPauseOnCurrent: function () {
-      return this.$refs.watchVideoPlaylist?.pauseOnCurrentVideo ?? false
-    },
-
-    disablePlaylistPauseOnCurrent: function () {
-      if (this.$refs.watchVideoPlaylist) {
-        this.$refs.watchVideoPlaylist.pauseOnCurrentVideo = false
-      }
-    },
-
     updateTitle: function () {
       document.title = `${this.videoTitle} - ${packageDetails.productName}`
     },
diff --git a/static/locales/en-GB.yaml b/static/locales/en-GB.yaml
index 587aae689c78a..f45a9097eedf2 100644
--- a/static/locales/en-GB.yaml
+++ b/static/locales/en-GB.yaml
@@ -1218,10 +1218,6 @@ Hashtag:
   Hashtag: Hashtag
   This hashtag does not currently have any videos: This hashtag does not currently
     have any videos
-Playlist will pause when current video is finished: Playlist will pause when current
-  video is finished
-Playlist will not pause when current video is finished: Playlist will not pause when
-  current video is finished
 Go to page: Go to {page}
 Tag already exists: ‘{tagName}’ tag already exists
 Close Banner: Close Banner
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 4daf8020eabb6..798461607a28e 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -1093,8 +1093,6 @@ Shuffle is now enabled: Shuffle is now enabled
 The playlist has been reversed: The playlist has been reversed
 Playing Next Video: Playing Next Video
 Playing Previous Video: Playing Previous Video
-Playlist will not pause when current video is finished: Playlist will not pause when current video is finished
-Playlist will pause when current video is finished: Playlist will pause when current video is finished
 Playing Next Video Interval: Playing next video in no time. Click to cancel. | Playing next video in {nextVideoInterval} second. Click to cancel. | Playing next video in {nextVideoInterval} seconds. Click to cancel.
 Canceled next video autoplay: Canceled next video autoplay