Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #1321 Open detail when quoted status is clicked

Browse Source
This commit is contained in:
AkiraFukushima 2020-05-12 21:53:22 +09:00
parent d7fba4cd43
commit 00f561e261
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/components/TimelineSpace/Contents/Home.vue
View File

@ -56,7 +56,7 @@ export default {
showReplies: state => state.TimelineSpace.Contents.Home.showReplies showReplies: state => state.TimelineSpace.Contents.Home.showReplies
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -86,7 +86,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -109,14 +109,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Home/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Home/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {

2
src/renderer/components/molecules/Toot/Quote.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="quote"> <div class="quote" v-on:click.stop.prevent="$emit('select')">
<FailoverImg class="icon" :src="icon" :alt="`Avatar of ${username}`" /> <FailoverImg class="icon" :src="icon" :alt="`Avatar of ${username}`" />
<div class="contents"> <div class="contents">
<div class="header"> <div class="header">

3
src/renderer/components/organisms/Toot.vue
View File

@ -21,7 +21,7 @@
" "
@shortkey="handleTootControl" @shortkey="handleTootControl"
ref="status" ref="status"
@click="$emit('selectToot')" @click="$emit('selectToot', message)"
role="article" role="article"
aria-label="toot" aria-label="toot"
> >
@ -95,6 +95,7 @@
:username="username(message.reblog.account)" :username="username(message.reblog.account)"
:accountName="accountName(message.reblog.account)" :accountName="accountName(message.reblog.account)"
:body="message.reblog.content" :body="message.reblog.content"
@select="openDetail(message.reblog)"
/> />
<LinkPreview <LinkPreview
v-if="originalMessage.card && originalMessage.card.type === 'link'" v-if="originalMessage.card && originalMessage.card.type === 'link'"