diff --git a/package-lock.json b/package-lock.json index 8a1e2118..3753c90e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17758,7 +17758,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "schema-utils": { @@ -20368,7 +20369,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "string-width": { diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js index 9e4f7f79..7449fbfd 100644 --- a/src/renderer/components/ft-icon-button/ft-icon-button.js +++ b/src/renderer/components/ft-icon-button/ft-icon-button.js @@ -19,10 +19,18 @@ export default Vue.extend({ type: Boolean, default: true }, - dropdownPosition: { + forceDropdown: { + type: Boolean, + default: false + }, + dropdownPositionX: { type: String, default: 'center' }, + dropdownPositionY: { + type: String, + default: 'bottom' + }, dropdownNames: { type: Array, default: () => { return [] } @@ -43,7 +51,7 @@ export default Vue.extend({ }, handleIconClick: function () { - if (this.dropdownNames.length > 0 && this.dropdownValues.length > 0) { + if (this.forceDropdown || (this.dropdownNames.length > 0 && this.dropdownValues.length > 0)) { this.toggleDropdown() } else { this.$emit('click') diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue index 1a5e860c..f1ff3443 100644 --- a/src/renderer/components/ft-icon-button/ft-icon-button.vue +++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue @@ -13,12 +13,14 @@ @click="handleIconClick" />
+ + +
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue index 09503a05..1018a95b 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.vue +++ b/src/renderer/components/ft-list-video/ft-list-video.vue @@ -42,7 +42,7 @@ title="More Options" theme="base" :use-shadow="false" - dropdown-position="left" + dropdown-position-x="left" :dropdown-names="optionsNames" :dropdown-values="optionsValues" @click="handleOptionsClick" diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js index 550b0067..a08a4546 100644 --- a/src/renderer/components/watch-video-info/watch-video-info.js +++ b/src/renderer/components/watch-video-info/watch-video-info.js @@ -36,6 +36,10 @@ export default Vue.extend({ type: String, required: true }, + published: { + type: Number, + required: true + }, viewCount: { type: Number, required: true diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue index d638f6aa..43bf9f25 100644 --- a/src/renderer/views/Watch/Watch.vue +++ b/src/renderer/views/Watch/Watch.vue @@ -25,6 +25,7 @@ :channel-id="channelId" :channel-name="channelName" :channel-thumbnail="channelThumbnail" + :published="videoPublished" :subscription-count-text="channelSubscriptionCountText" :like-count="videoLikeCount" :dislike-count="videoDislikeCount"