From 2bad5c0da473ea4a51190c98cbf1ef5d62d0bd87 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 29 Oct 2015 16:17:37 -0400 Subject: [PATCH] (js) Preserve the time when changing the day --- UI/WebServerResources/js/Scheduler/ComponentController.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js index 9c509766c..2fd0669f8 100644 --- a/UI/WebServerResources/js/Scheduler/ComponentController.js +++ b/UI/WebServerResources/js/Scheduler/ComponentController.js @@ -178,11 +178,16 @@ }); $scope.$watch('editor.component.end', function(newEndDate, oldEndDate) { + if (newEndDate.getDate() !== oldEndDate.getDate() || + newEndDate.getMonth() !== oldEndDate.getMonth() || + newEndDate.getFullYear() !== oldEndDate.getFullYear()) + vm.component.end.addMinutes(oldEndDate.getHours() * 60 + oldEndDate.getMinutes()); + if (newEndDate <= vm.component.start) { vm.component.end = oldEndDate; } else { - vm.component.delta = Math.floor((Math.abs(vm.component.end-vm.component.start)/1000)/60); + vm.component.delta = Math.floor((Math.abs(vm.component.end - vm.component.start)/1000)/60); vm.component.freebusy = vm.component.updateFreeBusyCoverage(); vm.attendeesEditor.days = getDays(); }