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

Simplify datepicker

Browse Source
This commit is contained in:
Blade Barringer
2015-06-06 22:34:02 -05:00
parent 047902ac62
commit 41d0f505f3
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/public/js/controllers/tasksCtrl.js
View File

@@ -137,22 +137,14 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
Dailies Dailies
------------------------ ------------------------
*/ */
$scope.updateTaskStartDate = function(task) {
/*
Keep startDate and _tempDateForPicker in sync. The reason for having both instead
of having startDate be the ngmodel for datePicker is that datePicker initializes with
an incorrect format when given a Date for an ngmodel; instead we initialize _tempDate
to be a string that datePicker then converts to a Date, which lets us control the format.
*/
task.startDate = task._tempDateForPicker;
};
$scope.openDatePicker = function($event, task) { $scope.openDatePicker = function($event, task) {
$event.preventDefault();
$event.stopPropagation(); $event.stopPropagation();
task._isDatePickerOpen = !task._isDatePickerOpen; task._isDatePickerOpen = !task._isDatePickerOpen;
} }
/* /*
------------------------ ------------------------
Checklists Checklists

8
website/views/shared/tasks/edit/advanced_options.jade
View File

@@ -8,12 +8,12 @@ div(ng-if='::task.type!="reward"')
.form-group .form-group
legend.option-title=env.t('startDate') legend.option-title=env.t('startDate')
.input-group .input-group
input.form-control(type='date', ng-model='task._tempDateForPicker', input.form-control(type='text', ng-model='task.startDate',
ng-change='updateTaskStartDate(task)', datepicker-popup='M/dd/yyyy', is-open='task._isDatePickerOpen',
is-open='task._isDatePickerOpen', datepicker-popup, required) ng-required='true', close-text='Close')
span.input-group-btn span.input-group-btn
button.btn.btn-default(type='button' ng-click='openDatePicker($event, task)') button.btn.btn-default(type='button' ng-click='openDatePicker($event, task)')
.glyphicon.glyphicon-calendar i.glyphicon.glyphicon-calendar
hr hr