From 0afc955ebd54e7d242a4d796df38931eaecb40d5 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 16:08:57 +0300 Subject: [PATCH 1/7] registration fixes --- src/components/registration/registration.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index a792fb7b..a3ef0f04 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -24,7 +24,7 @@ const registration = { password: { required }, confirm: { required, - sameAs: sameAs(this.password) + sameAs: sameAs(this.user.password) }, reason: { required: requiredIf(() => this.accountApprovalRequired) } } @@ -65,9 +65,9 @@ const registration = { this.user.captcha_token = this.captcha.token this.user.captcha_answer_data = this.captcha.answer_data - this.$v.$touch() + this.v$.$touch() - if (!this.$v.$invalid) { + if (!this.v$.$invalid) { try { await this.signUp(this.user) this.$router.push({ name: 'friends' }) From bc029b0fa2499651a7ff541f09afe1fbc2e19cea Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:04:01 +0300 Subject: [PATCH 2/7] fix spacing in poll expiration label --- src/components/poll/poll.vue | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 9e37a9d7..f6b12a54 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -71,16 +71,18 @@ {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ยท </template> </div> - <i18n-t - scope="global" - :keypath="expired ? 'polls.expired' : 'polls.expires_in'" - > - <Timeago - :time="expiresAt" - :auto-update="60" - :now-threshold="0" - /> - </i18n-t> + <span> + <i18n-t + scope="global" + :keypath="expired ? 'polls.expired' : 'polls.expires_in'" + > + <Timeago + :time="expiresAt" + :auto-update="60" + :now-threshold="0" + /> + </i18n-t> + </span> </div> </div> </template> From 218b15b5fd3c09f927e4f92b5cee7ef988c9ae39 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:12:57 +0300 Subject: [PATCH 3/7] fix reset buttons in profile again --- src/components/settings_modal/tabs/profile_tab.scss | 6 +++++- src/components/settings_modal/tabs/profile_tab.vue | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss index 111eaed3..3c9683cd 100644 --- a/src/components/settings_modal/tabs/profile_tab.scss +++ b/src/components/settings_modal/tabs/profile_tab.scss @@ -54,16 +54,20 @@ border-radius: var(--tooltipRadius, $fallback--tooltipRadius); background-color: rgba(0, 0, 0, 0.6); opacity: 0.7; - color: white; width: 1.5em; height: 1.5em; text-align: center; line-height: 1.5em; font-size: 1.5em; cursor: pointer; + &:hover { opacity: 1; } + + svg { + color: white; + } } .oauth-tokens { diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index d3f6727f..881016fb 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -111,9 +111,9 @@ v-if="!isDefaultAvatar && pickAvatarBtnVisible" :title="$t('settings.reset_avatar')" @click="resetAvatar" + class="button-unstyled reset-button" > <FAIcon - class="reset-button" icon="times" type="button" /> @@ -141,11 +141,11 @@ <img :src="user.cover_photo"> <button v-if="!isDefaultBanner" + class="button-unstyled reset-button" :title="$t('settings.reset_profile_banner')" @click="resetBanner" > <FAIcon - class="reset-button" icon="times" type="button" /> @@ -183,12 +183,11 @@ <img :src="user.background_image"> <button v-if="!isDefaultBackground" - class="button-unstyled" + class="button-unstyled reset-button" :title="$t('settings.reset_profile_background')" @click="resetBackground" > <FAIcon - class="reset-button" icon="times" type="button" /> From a1822f073d50f101d55ecfe47b664b44f741cb38 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:20:43 +0300 Subject: [PATCH 4/7] removing uselsess stuff --- src/components/gallery/gallery.vue | 1 - src/components/mentions_line/mentions_line.vue | 2 -- src/components/status/status.vue | 1 - 3 files changed, 4 deletions(-) diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue index f2e1b5ce..ccf6e3e2 100644 --- a/src/components/gallery/gallery.vue +++ b/src/components/gallery/gallery.vue @@ -22,7 +22,6 @@ class="gallery-item" :nsfw="nsfw" :attachment="attachment" - :allow-play="false" :size="size" :editable="editable" :remove="removeAttachment" diff --git a/src/components/mentions_line/mentions_line.vue b/src/components/mentions_line/mentions_line.vue index f375e3b0..09b6a1d6 100644 --- a/src/components/mentions_line/mentions_line.vue +++ b/src/components/mentions_line/mentions_line.vue @@ -6,7 +6,6 @@ class="mention-link" :content="mention.content" :url="mention.url" - :first-mention="false" /><span v-if="manyMentions" class="extraMentions" @@ -21,7 +20,6 @@ class="mention-link" :content="mention.content" :url="mention.url" - :first-mention="false" /> </span><button v-if="!expanded" diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 61feb303..67ce999a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -296,7 +296,6 @@ :url="replyProfileLink" :user-id="status.in_reply_to_user_id" :user-screen-name="status.in_reply_to_screen_name" - :first-mention="false" /> </span> From e1483488c7982daa9272c570f0a5a9296519ef31 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:23:30 +0300 Subject: [PATCH 5/7] fix some issues with trees --- src/components/status/status.js | 2 +- src/components/status_content/status_content.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index c6b24c72..ec0bd25a 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index f47d036a..68e75d9e 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) From de2f9686452b2bcb6cfe08fe9a5b648ec6bd5ed2 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:44:07 +0300 Subject: [PATCH 6/7] fix? --- src/components/status/status.js | 2 +- src/components/status_content/status_content.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index ec0bd25a..a925f30b 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return ((this.$data[toggle] !== undefined || this.$props[toggle] !== undefined) && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index 68e75d9e..e69c3afd 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return ((this.$data[toggle] !== undefined || this.$props[toggle] !== undefined) && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) From a3f48fc3f4230b283d62f55fcdf03247ae2ac481 Mon Sep 17 00:00:00 2001 From: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 19:55:30 +0300 Subject: [PATCH 7/7] fix warning about custom component --- build/webpack.base.conf.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 65d398c8..1a0e486a 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -64,6 +64,12 @@ module.exports = { loader: 'vue-loader', options: { compilerOptions: { + isCustomElement(tag) { + if (tag === 'pinch-zoom') { + return true + } + return false + }, compatConfig: { MODE: 2 }