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/advanced_options.jade
+20 -20
View File
@@ -1,22 +1,22 @@
div(ng-if='::task.type!="reward"')
button.advanced-options-toggle.option-title.mega(type='button',
ng-class='{active: task._edit._advanced}',
ng-click='task._edit._advanced = !task._edit._advanced', tooltip=env.t('expandCollapse'))
ng-class='{active: task._advanced}',
ng-click='task._advanced = !task._advanced', tooltip=env.t('expandCollapse'))
=env.t('advancedOptions')
fieldset.option-group.advanced-option(ng-if="task.userId" ng-show="task._edit._advanced")
fieldset.option-group.advanced-option(ng-if="task.userId" ng-show="task._advanced")
legend.option-title
a.hint(href='http://habitica.wikia.com/wiki/Task_Alias', target='_blank', popover-trigger='mouseenter', popover="{{::env.t('taskAliasPopover')}} {{::task._edit.alias ? '\n\n\' + env.t('taskAliasPopoverWarning') : ''}}")=env.t('taskAlias')
input.form-control(ng-model='task._edit.alias' type='text' placeholder=env.t('taskAliasPlaceholder'))
a.hint(href='http://habitica.wikia.com/wiki/Task_Alias', target='_blank', popover-trigger='mouseenter', popover="{{::env.t('taskAliasPopover')}} {{::task.alias ? '\n\n\' + env.t('taskAliasPopoverWarning') : ''}}")=env.t('taskAlias')
input.form-control(ng-model='task.alias' type='text' placeholder=env.t('taskAliasPlaceholder'))
div(ng-show='task._edit._advanced')
div(ng-show='task._advanced')
div(ng-if='::task.type == "daily"')
.form-group
legend.option-title
span.hint(popover-title=env.t('startDateHelpTitle'), popover=env.t("startDateHelp"), popover-trigger='mouseenter')
=env.t('startDate')
input.form-control(type='text', ng-model='task._edit.startDate',
input.form-control(type='text', ng-model='task.startDate',
datepicker-popup='{{::user.preferences.dateFormat}}', is-open='datepickerOpened',
ng-click='datepickerOpened = true', ng-disabled='!canEdit(task)')
@@ -24,7 +24,7 @@ div(ng-if='::task.type!="reward"')
.form-group
legend.option-title=env.t('repeat')
select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
select.form-control(ng-model='task.frequency', ng-disabled='!canEdit(task)')
option(value='weekly')=env.t('repeatWeek')
option(value='daily')=env.t('repeatDays')
@@ -32,38 +32,38 @@ div(ng-if='::task.type!="reward"')
hr
fieldset.option-group.advanced-option(ng-show="task._edit._advanced")
fieldset.option-group.advanced-option(ng-show="task._advanced")
legend.option-title
a.hint.priority-multiplier-help(href='http://habitica.wikia.com/wiki/Difficulty', target='_blank', popover-title=env.t('difficultyHelpTitle'), popover-trigger='mouseenter', popover=env.t('difficultyHelpContent'))=env.t('difficulty')
ul.priority-multiplier
li
button(type='button', ng-class='{active: task._edit.priority==0.1}',
ng-click='!canEdit(task) || (task._edit.priority=0.1)')
button(type='button', ng-class='{active: task.priority==0.1}',
ng-click='!canEdit(task) || (task.priority=0.1)')
=env.t('trivial')
li
button(type='button', ng-class='{active: task._edit.priority==1 || !task._edit.priority}',
ng-click='!canEdit(task) || (task._edit.priority=1)')
button(type='button', ng-class='{active: task.priority==1 || !task.priority}',
ng-click='!canEdit(task) || (task.priority=1)')
=env.t('easy')
li
button(type='button', ng-class='{active: task._edit.priority==1.5}',
ng-click='!canEdit(task) || (task._edit.priority=1.5)')
button(type='button', ng-class='{active: task.priority==1.5}',
ng-click='!canEdit(task) || (task.priority=1.5)')
=env.t('medium')
li
button(type='button', ng-class='{active: task._edit.priority==2}',
ng-click='!canEdit(task) || (task._edit.priority=2)')
button(type='button', ng-class='{active: task.priority==2}',
ng-click='!canEdit(task) || (task.priority=2)')
=env.t('hard')
span(ng-if='task.type=="daily" && !$state.includes("options.social.challenges")')
legend.option-title.pull-left=env.t('restoreStreak')
input.option-content(type='number', ng-model='task._edit.streak')
input.option-content(type='number', ng-model='task.streak')
div(ng-if='::(user.preferences.allocationMode == "taskbased" && user.preferences.automaticAllocation) || $state.is("options.social.challenges")')
legend.option-title.pull-left=env.t('attributes')
ul.task-attributes
each attribute, short in {str: 'strength', int: 'intelligence', con: 'constitution', per: 'perception'}
li
button(type='button', ng-class='{active: task._edit.attribute=="#{short}"}',
ng-click='task._edit.attribute="#{short}"',
button(type='button', ng-class='{active: task.attribute=="#{short}"}',
ng-click='task.attribute="#{short}"',
popover=env.t('#{attribute}Example'), popover-trigger='mouseenter', popover-placement='top')
=env.t(attribute)
website/views/shared/tasks/edit/checklist.jade
+4 -4
View File
@@ -1,19 +1,19 @@
.task-checklist-edit(ng-if='::!$state.includes("options.social.challenges") && (task.type=="daily" || task.type=="todo")')
ul
li
button(type='button', ng-if='!task._edit.checklist[0]'
button(type='button', ng-if='!task.checklist[0]'
popover=env.t('checklistText'), popover-trigger='mouseenter', popover-placement='bottom',
ng-click='addChecklist(task)')
span.glyphicon.glyphicon-tasks
span=env.t('addChecklist')
.checklist-form(ng-if='task._edit.checklist')
.checklist-form(ng-if='task.checklist')
fieldset.option-group(ng-if='!$state.includes("options.social.challenges")')
legend.option-title(ng-if='task._edit.checklist[0]')
legend.option-title(ng-if='task.checklist[0]')
span.hint(popover=env.t('checklistText'), popover-trigger='mouseenter', popover-placement='bottom')
=env.t('checklist')
ul(hrpg-sort-checklist)
li(ng-repeat='item in task._edit.checklist')
li(ng-repeat='item in task.checklist')
//input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
//-,ng-blur='saveTask(task,true)')
span.checklist-icon.glyphicon.glyphicon-resize-vertical
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)
website/views/shared/tasks/edit/habits/plus_minus.jade
+3 -3
View File
@@ -1,8 +1,8 @@
fieldset.option-group.plusminus(ng-if='task.type === "habit" && canEdit(task)')
fieldset.option-group.plusminus(ng-if='task.type=="habit" && canEdit(task)')
legend.option-title=env.t('direction/Actions')
span.task-checker
input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-plus', type='checkbox', ng-model='task._edit.up')
input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-plus', type='checkbox', ng-model='task.up')
label(for='{{obj._id}}_{{task._id}}-option-plus')
span.task-checker
input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-minus', type='checkbox', ng-model='task._edit.down')
input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-minus', type='checkbox', ng-model='task.down')
label(for='{{obj._id}}_{{task._id}}-option-minus')
website/views/shared/tasks/edit/rewards/pricing.jade
+2 -2
View File
@@ -1,5 +1,5 @@
fieldset.option-group.option-short(ng-if='task.type=="reward" && !task._edit.challenge.id')
fieldset.option-group.option-short(ng-if='task.type=="reward" && !task.challenge.id')
legend.option-title=env.t('price')
input.option-content(type='number', size='16', min='0', step='any', ng-model='task._edit.value', required)
input.option-content(type='number', size='16', min='0', step='any', ng-model='task.value', required)
.money.input-suffix
span.shop_gold
website/views/shared/tasks/edit/text_notes.jade
+2 -2
View File
@@ -1,7 +1,7 @@
fieldset.option-group
label.option-title=env.t('text')
input.form-control(type='text', ng-model='task._edit.text', ng-disabled='!canEdit(task)', required)
input.form-control(type='text', ng-model='task.text', ng-disabled='!canEdit(task)', required)
fieldset.option-group
label.option-title=env.t('extraNotes')
textarea.form-control(rows='3', ng-model='task._edit.notes')
textarea.form-control(rows='3', ng-model='task.notes', ng-model-options="{debounce: 1000}")