Skip to main content
Homepage
Explore
Search or go to…
/
Sign in
Explore
Primary navigation
Project
N
Nextcloud mail - PostGuard
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
Laura Kolijn
Nextcloud mail - PostGuard
Commits
26581ee7
Unverified
Commit
26581ee7
authored
Sep 25, 2018
by
Christoph Wurst
Committed by
GitHub
Sep 25, 2018
Browse files
Options
Downloads
Plain Diff
Merge pull request #1156 from nextcloud/refactor/vue-message-envelope-disambiguation
Make message and envelope unambiguous
parents
6464abec
32a2184d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/components/Envelope.vue
+0
-0
0 additions, 0 deletions
js/components/Envelope.vue
js/components/EnvelopeList.vue
+4
-4
4 additions, 4 deletions
js/components/EnvelopeList.vue
js/components/FolderContent.vue
+3
-3
3 additions, 3 deletions
js/components/FolderContent.vue
with
7 additions
and
7 deletions
js/components/
MessageListItem
.vue
→
js/components/
Envelope
.vue
+
0
−
0
View file @
26581ee7
File moved
This diff is collapsed.
Click to expand it.
js/components/
Messag
eList.vue
→
js/components/
Envelop
eList.vue
+
4
−
4
View file @
26581ee7
...
...
@@ -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
:
"
Messag
eList
"
,
name
:
"
Envelop
eList
"
,
computed
:
{
envelopes
()
{
return
this
.
$store
.
getters
.
getEnvelopes
(
...
...
@@ -37,7 +37,7 @@
}
},
components
:
{
MessageListItem
,
Envelope
,
EmptyFolder
,
},
directives
:
{
...
...
...
...
This diff is collapsed.
Click to expand it.
js/components/FolderContent.vue
+
3
−
3
View file @
26581ee7
...
...
@@ -4,7 +4,7 @@
<Loading
v-if=
"loading"
:hint=
"t('mail', 'Loading messages')"
/>
<template
v-else
>
<
Messag
eList/>
<
Envelop
eList/>
<NewMessageDetail
v-if=
"newMessage"
/>
<Message
v-else-if=
"hasMessages"
/>
</
template
>
...
...
@@ -14,7 +14,7 @@
<
script
>
import
Message
from
"
./Message
"
;
import
Messag
eList
from
"
./
Messag
eList
"
;
import
Envelop
eList
from
"
./
Envelop
eList
"
;
import
NewMessageDetail
from
"
./NewMessageDetail
"
;
import
Loading
from
"
./Loading
"
;
...
...
@@ -24,7 +24,7 @@
Loading
,
NewMessageDetail
,
Message
,
Messag
eList
Envelop
eList
,
},
data
()
{
return
{
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment