summaryrefslogtreecommitdiffstats
path: root/apps/tasks/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/tasks/js')
-rw-r--r--apps/tasks/js/tasks.js21
1 files changed, 14 insertions, 7 deletions
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index 9866250322d..684f671e41a 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -85,7 +85,9 @@ OC.Tasks = {
if (task.due){
var date = new Date(parseInt(task.due)*1000);
due.find('.date').datepicker('setDate', date);
- due.find('.time').timepicker('setTime', date.getHours()+':'+date.getMinutes());
+ if (!task.due_date_only) {
+ due.find('.time').timepicker('setTime', date.getHours()+':'+date.getMinutes());
+ }
}
$('<div>')
.addClass('more')
@@ -186,16 +188,21 @@ OC.Tasks = {
var $date = $(this).parent().children('.date');
var $time = $(this).parent().children('.time');
var date = $date.datepicker('getDate');
- var time = $time.timepicker('getTime').split(':');
- var due;
- if (!date || time.length<2){
+ var time = $time.val().split(':');
+ var due, date_only = false;
+ if (!date){
due = false;
} else {
- date.setHours(time[0]);
- date.setMinutes(time[1]);
+ if (time.length==2){
+ date.setHours(time[0]);
+ date.setMinutes(time[1]);
+ }
+ else {
+ date_only = true;
+ }
due = date.getTime()/1000;
}
- $.post('ajax/update_property.php', {id:task.id, type:'due', due:due}, function(jsondata){
+ $.post('ajax/update_property.php', {id:task.id, type:'due', due:due, date:date_only?1:0}, function(jsondata){
if(jsondata.status != 'success') {
task.due = old_due;
}