summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDate.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-01-28 00:02:35 +0200
committerLauri Ojansivu <x@xet7.org>2018-01-28 00:02:35 +0200
commit6aca70f0d11cd93355f65356c5550e7071f42aaa (patch)
tree62f9fb26fb52ae9f71c1f09d37af9058fa00ed75 /client/components/cards/cardDate.js
parent963e3193451327cec89da2abc1f4aee7ee308f08 (diff)
parent081c1fdf835c6f1d2030b3b9e23229378d4f8cce (diff)
downloadwekan-6aca70f0d11cd93355f65356c5550e7071f42aaa.tar.gz
wekan-6aca70f0d11cd93355f65356c5550e7071f42aaa.tar.bz2
wekan-6aca70f0d11cd93355f65356c5550e7071f42aaa.zip
Merge branch 'devel'
Diffstat (limited to 'client/components/cards/cardDate.js')
-rw-r--r--client/components/cards/cardDate.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 3f69f384..abf6a42b 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -171,11 +171,12 @@ class CardStartDate extends CardDate {
}
classes() {
+ let classes = 'start-date' + ' ';
if (this.date.get().isBefore(this.now.get(), 'minute') &&
this.now.get().isBefore(this.data().dueAt)) {
- return 'current';
+ classes += 'current';
}
- return '';
+ return classes;
}
showTitle() {
@@ -200,13 +201,14 @@ class CardDueDate extends CardDate {
}
classes() {
+ let classes = 'due-date' + ' ';
if (this.now.get().diff(this.date.get(), 'days') >= 2)
- return 'long-overdue';
+ classes += 'long-overdue';
else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
- return 'due';
+ classes += 'due';
else if (this.now.get().diff(this.date.get(), 'days') >= -1)
- return 'almost-due';
- return '';
+ classes += 'almost-due';
+ return classes;
}
showTitle() {