diff --git a/client/components/Comment.vue b/client/components/Comment.vue index 3128e3bfb..21764494d 100644 --- a/client/components/Comment.vue +++ b/client/components/Comment.vue @@ -131,8 +131,8 @@ export default Vue.extend({ } }) .then(response => { - this.replies = response.comments; - this.repliesContinuationLink = response.continuation || null; + this.replies = response.data.comments; + this.repliesContinuationLink = response.data.continuation || null; this.repliesLoaded = true; this.loadingReplies = false; }) @@ -157,8 +157,8 @@ export default Vue.extend({ } }) .then(response => { - this.replies = this.replies.concat(response.comments); - this.repliesContinuationLink = response.continuation || null; + this.replies = this.replies.concat(response.data.comments); + this.repliesContinuationLink = response.data.continuation || null; this.repliesContinuationLoading = false; }) .catch(error => { diff --git a/client/components/Settings.vue b/client/components/Settings.vue index 0386b1dee..1c3868e9f 100644 --- a/client/components/Settings.vue +++ b/client/components/Settings.vue @@ -5,6 +5,13 @@

Settings

Theme

+

Chapters

+

Miniplayer

- -
-
- Automatic quality -
-

Max: {{ maxAdaptiveQuality.qualityLabel }}

-

Min: {{ minAdaptiveQuality.qualityLabel }}

+ + +
+
+
+ Automatic quality +
+

Max: {{ maxAdaptiveQuality.qualityLabel }}

+

Min: {{ minAdaptiveQuality.qualityLabel }}

+
+
+
+ Video Quality +
+ {{ quality.qualityLabel }} +
+
-
- Legacy format -
- {{ quality.qualityLabel }} -
-
-
- + +
@@ -50,12 +59,12 @@ export default Vue.extend({ MagicIcon }, props: { + selectedQuality: Number, formatStreams: Array, - adaptiveFormats: Array + adaptiveFormats: { type: Array, required: false, default: null } }, data: () => ({ qualityUrl: null, - selectedQuality: 1, popup: false, elementHeight: 0 }), @@ -66,6 +75,9 @@ export default Vue.extend({ minAdaptiveQuality(): any { return this.sortedAdaptiveQualities[0]; }, + formatQualities(): any { + return this.formatStreams.filter(el => el.qualityLabel); + }, sortedAdaptiveQualities(): any { return this.adaptiveVideos.slice().sort((a, b) => parseInt(a.bitrate) - parseInt(b.bitrate)); }, @@ -83,27 +95,37 @@ export default Vue.extend({ }, onQualityMouseup() {}, onQualityTouchInteraction() {}, - setFormatQuality() {}, + setFormatQuality(nr: number) { + this.$emit('qualityselect', nr); + }, setAutoQuality() {} } }); diff --git a/client/components/videoplayer/VolumeControl.vue b/client/components/videoplayer/VolumeControl.vue index 62aa8595f..939954f0b 100644 --- a/client/components/videoplayer/VolumeControl.vue +++ b/client/components/videoplayer/VolumeControl.vue @@ -1,5 +1,11 @@