krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 13:17:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2018-03-28 21:33:04 +00:00
parent 7914a959b3 0e442a0076
commit f86f98f4a6
38 changed files with 342 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/client/components/tasks/taskModal.vue
View File

@@ -726,9 +726,10 @@ export default {
if (this.task) this.checklist = clone(this.task.checklist);
},
'task.startDate' () {
if (this.task && this.repeatsOn) {
this.calculateMonthlyRepeatDays(this.repeatsOn);
}
this.calculateMonthlyRepeatDays();
},
'task.frequency' () {
this.calculateMonthlyRepeatDays();
},
},
computed: {
@@ -795,9 +796,6 @@ export default {
return repeatsOn;
},
set (newValue) {
this.calculateMonthlyRepeatDays(newValue);
},
},
selectedTags () {
return this.getTagsFor(this.task);
@@ -858,8 +856,10 @@ export default {
weekdaysMin (dayNumber) {
return moment.weekdaysMin(dayNumber);
},
calculateMonthlyRepeatDays (repeatsOn) {
calculateMonthlyRepeatDays () {
if (!this.task) return;
const task = this.task;
const repeatsOn = this.repeatsOn;
if (task.frequency === 'monthly') {
if (repeatsOn === 'dayOfMonth') {