Skip to content

Rename message component to thread #3539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Sep 3, 2020
Merged

Rename message component to thread #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/components/MailboxMessage.vue → src/components/MailboxThread.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</template>
</AppContentList>
<NewMessageDetail v-if="newMessage" />
<Message v-else-if="showMessage" @delete="deleteMessage" />
<Thread v-else-if="showMessage" @delete="deleteMessage" />
<NoMessageSelected v-else-if="hasMessages && !isMobile" />
</div>
</AppContent>
Expand All @@ -74,27 +74,27 @@ import Vue from 'vue'
import AppDetailsToggle from './AppDetailsToggle'
import logger from '../logger'
import Mailbox from './Mailbox'
import Message from './Message'
import NewMessageDetail from './NewMessageDetail'
import NoMessageSelected from './NoMessageSelected'
import { normalizedEnvelopeListId } from '../store/normalization'
import Thread from './Thread'
import { UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID } from '../store/constants'

export default {
name: 'MailboxMessage',
name: 'MailboxThread',
directives: {
infiniteScroll,
},
components: {
AppContent,
Popover,
AppContentList,
AppDetailsToggle,
Mailbox,
Message,
NewMessageDetail,
NoMessageSelected,
Popover,
SectionTitle,
Thread,
},
mixins: [isMobile],
props: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Message.vue → src/components/Thread.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ import MessageAttachments from './MessageAttachments'
import ThreadMessage from './ThreadMessage'

export default {
name: 'Message',
name: 'Thread',
components: {
ActionButton,
Actions,
Expand Down
6 changes: 3 additions & 3 deletions src/views/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<template>
<Content v-shortkey.once="['c']" app-name="mail" @shortkey.native="onNewMessage">
<Navigation />
<MailboxMessage v-if="activeAccount" :account="activeAccount" :mailbox="activeMailbox" />
<MailboxThread v-if="activeAccount" :account="activeAccount" :mailbox="activeMailbox" />
</Content>
</template>

<script>
import Content from '@nextcloud/vue/dist/Components/Content'

import MailboxMessage from '../components/MailboxMessage'
import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
import logger from '../logger'
import MailboxThread from '../components/MailboxThread'
import Navigation from '../components/Navigation'

export default {
name: 'Home',
components: {
Content,
MailboxMessage,
MailboxThread,
Navigation,
},
mixins: [isMobile],
Expand Down