Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fixes task edit cancellation commit (#7931)"

Browse Source 
This reverts commit bbf15e1756.
This commit is contained in:
Sabe Jones
2016-09-13 16:32:52 +00:00
parent 282822def6
commit 2da9876e42
12 changed files with 77 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/shared/tasks/edit/dailies/repeat_options.jade
+8 -8
View File
@@ -1,22 +1,22 @@
legend.option-title
span.hint(popover-trigger='mouseenter', popover-title=env.t('repeatHelpTitle'),
popover='{{env.t(task._edit.frequency + "RepeatHelpContent")}}')=env.t('repeatEvery')
popover='{{env.t(task.frequency + "RepeatHelpContent")}}')=env.t('repeatEvery')
// If frequency is daily
ng-form.form-group(name='everyX', ng-if='task._edit.frequency=="daily"')
ng-form.form-group(name='everyX', ng-if='task.frequency=="daily"')
.input-group
input.form-control(type='number', ng-model='task._edit.everyX', min='0', ng-disabled='!canEdit(task)', required)
span.input-group-addon {{task._edit.everyX == 1 ? env.t('day') : env.t('days')}}
input.form-control(type='number', ng-model='task.everyX', min='0', ng-disabled='!canEdit(task)', required)
span.input-group-addon {{task.everyX == 1 ? env.t('day') : env.t('days')}}
// If frequency is weekly
.form-group(ng-if='task._edit.frequency=="weekly"')
.form-group(ng-if='task.frequency=="weekly"')
ul.repeat-days
// note, does not use data-toggle="buttons-checkbox" - it would interfere with our own click binding
mixin dayOfWeek(day, num)
li
button(type='button', ng-class='{active: task._edit.repeat.#{day}}',
ng-disabled='!canEdit(task)', ng-click='task._edit.repeat.#{day} = !task._edit.repeat.#{day}',
tooltip='{{env.t((task._edit.repeat.#{day}) ? "due" : "notDue")}}')
button(type='button', ng-class='{active: task.repeat.#{day}}',
ng-disabled='!canEdit(task)', ng-click='task.repeat.#{day} = !task.repeat.#{day}',
tooltip='{{env.t((task.repeat.#{day}) ? "due" : "notDue")}}')
| {{::moment.weekdaysMin(#{num})}}
+dayOfWeek('su', 0)