Merge branch 'development' into vue3-test

FreeTubeApp · Apr 19, 2024 · 7b95c84 · 7b95c84
2 parents d98a96a + 5d0dd3f
commit 7b95c84
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 15 deletions.
diff --git a/src/renderer/components/ft-list-video-numbered/ft-list-video-numbered.js b/src/renderer/components/ft-list-video-numbered/ft-list-video-numbered.js
@@ -80,6 +80,7 @@ export default defineComponent({
       default: false,
     }
   },
+  emits: ['move-video-down', 'move-video-up', 'pause-player', 'remove-from-playlist'],
   data: function () {
     return {
       visible: false,
@@ -136,6 +137,18 @@ export default defineComponent({
           this.stopWatchingInitialVisibleState = null
         }
       }
+    },
+    pausePlayer: function () {
+      this.$emit('pause-player')
+    },
+    moveVideoUp: function () {
+      this.$emit('move-video-up')
+    },
+    moveVideoDown: function () {
+      this.$emit('move-video-down')
+    },
+    removeFromPlaylist: function () {
+      this.$emit('remove-from-playlist')
     }
   }
 })
diff --git a/src/renderer/components/ft-list-video-numbered/ft-list-video-numbered.vue b/src/renderer/components/ft-list-video-numbered/ft-list-video-numbered.vue
@@ -40,10 +40,10 @@
         :can-move-video-up="canMoveVideoUp"
         :can-move-video-down="canMoveVideoDown"
         :can-remove-from-playlist="canRemoveFromPlaylist"
-        @pause-player="$emit('pause-player')"
-        @move-video-up="$emit('move-video-up')"
-        @move-video-down="$emit('move-video-down')"
-        @remove-from-playlist="$emit('remove-from-playlist')"
+        @pause-player="pausePlayer"
+        @move-video-up="moveVideoUp"
+        @move-video-down="moveVideoDown"
+        @remove-from-playlist="removeFromPlaylist"
       />
     </template>
   </div>

diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -805,7 +805,6 @@ export default defineComponent({
       // TODO: Maybe show playlist name
       showToast(this.$t('Video.Video has been removed from your saved list'))
     },
-
     moveVideoUp: function() {
       this.$emit('move-video-up')
     },

diff --git a/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js b/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js
@@ -40,6 +40,6 @@ export default defineComponent({
   methods: {
     click: function() {
       this.$emit('click')
-    }
+    },
   }
 })
diff --git a/src/renderer/components/ft-prompt/ft-prompt.js b/src/renderer/components/ft-prompt/ft-prompt.js
@@ -67,6 +67,9 @@ export default defineComponent({
     this.focusItem(0)
   },
   methods: {
+    click: function (value) {
+      this.$emit('click', value)
+    },
     hide: function() {
       this.$emit('click', null)
     },
@@ -105,10 +108,6 @@ export default defineComponent({
       }
     },
 
-    click: function(option) {
-      this.$emit('click', option)
-    },
-
     ...mapActions([
       'showOutlines'
     ])

diff --git a/src/renderer/components/ft-radio-button/ft-radio-button.js b/src/renderer/components/ft-radio-button/ft-radio-button.js
@@ -43,6 +43,6 @@ export default defineComponent({
     },
     change: function(value) {
       this.$emit('change', value)
-    }
+    },
   }
 })
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
@@ -21,9 +21,15 @@ export default defineComponent({
       required: true
     }
   },
+  emits: ['click'],
   computed: {
     isSideNavOpen: function () {
       return this.$store.getters.getIsSideNavOpen
     }
+  },
+  methods: {
+    click: function() {
+      this.$emit('click')
+    }
   }
 })
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
@@ -18,7 +18,7 @@
       :title="$t('Feed.Refresh Feed', { subscriptionName: title })"
       :size="12"
       theme="primary"
-      @click="$emit('click')"
+      @click="click"
     />
   </div>
 </template>

diff --git a/src/renderer/components/ft-select/ft-select.js b/src/renderer/components/ft-select/ft-select.js
@@ -66,5 +66,5 @@ export default defineComponent({
     change: function(value) {
       this.$emit('change', value)
     }
-  }
+  },
 })
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
@@ -55,6 +55,6 @@ export default defineComponent({
   methods: {
     change: function () {
       this.$emit('change', this.currentValue)
-    }
+    },
   }
 })
diff --git a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.vue b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.vue
@@ -58,6 +58,7 @@
         />
       </ft-flex-box>
     </ft-auto-load-next-page-wrapper>
+
     <ft-refresh-widget
       :disable-refresh="isLoading || activeSubscriptionList.length === 0"
       :last-refresh-timestamp="lastRefreshTimestamp"

diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -104,7 +104,7 @@ export default defineComponent({
       required: true
     }
   },
-  emits: ['set-info-area-sticky', 'scroll-to-info-area', 'pause-player', 'change-format'],
+  emits: ['change-format', 'pause-player', 'set-info-area-sticky', 'scroll-to-info-area'],
   computed: {
     hideSharingActions: function() {
       return this.$store.getters.getHideSharingActions
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,6 @@ export default defineComponent({ @@
         },
         change: function(value) {
           this.$emit('change', value)
-        }
+        },
       }
     })