Skip to main content
Sign in
Snippets Groups Projects
Unverified Commit 26581ee7 authored by Christoph Wurst's avatar Christoph Wurst Committed by GitHub
Browse files

Merge pull request #1156 from nextcloud/refactor/vue-message-envelope-disambiguation

Make message and envelope unambiguous
parents 6464abec 32a2184d
Branches
Tags
No related merge requests found
File moved
......@@ -7,7 +7,7 @@
<div id="list-refreshing"
:class="{'icon-loading-small': true, 'refreshing': refreshing}"/>
<EmptyFolder v-if="envelopes.length === 0"/>
<MessageListItem v-else
<Envelope v-else
v-for="env in envelopes"
:key="env.id"
:data="env"/>
......@@ -22,12 +22,12 @@
import Vue from 'vue'
import EmptyFolder from './EmptyFolder'
import MessageListItem from './MessageListItem'
import Envelope from './Envelope'
Vue.use(vuescroll, {throttle: 600})
export default {
name: "MessageList",
name: "EnvelopeList",
computed: {
envelopes () {
return this.$store.getters.getEnvelopes(
......@@ -37,7 +37,7 @@
}
},
components: {
MessageListItem,
Envelope,
EmptyFolder,
},
directives: {
......
......
......@@ -4,7 +4,7 @@
<Loading v-if="loading"
:hint="t('mail', 'Loading messages')"/>
<template v-else>
<MessageList/>
<EnvelopeList/>
<NewMessageDetail v-if="newMessage"/>
<Message v-else-if="hasMessages"/>
</template>
......@@ -14,7 +14,7 @@
<script>
import Message from "./Message";
import MessageList from "./MessageList";
import EnvelopeList from "./EnvelopeList";
import NewMessageDetail from "./NewMessageDetail";
import Loading from "./Loading";
......@@ -24,7 +24,7 @@
Loading,
NewMessageDetail,
Message,
MessageList
EnvelopeList,
},
data () {
return {
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment