amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

(js) Handle invalid dates in component editor

Browse Source
This commit is contained in:
Francis Lachapelle
2016-05-09 15:53:19 -04:00
parent 6aae6357c4
commit 8334c975e4
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/ComponentController.js
+23 -20
View File
@@ -295,7 +295,6 @@
function getHours() {
var hours = [];
for (var i = 0; i <= 23; i++) {
//hours.push(Component.timeFormat.formatTime(i, 0));
hours.push(i.toString());
}
return hours;
@@ -318,17 +317,19 @@
}
function adjustStartTime() {
// Preserve the delta between the start and end dates
var delta;
delta = oldStartDate.valueOf() - vm.component.start.valueOf();
if (delta !== 0) {
oldStartDate = new Date(vm.component.start.getTime());
if (vm.component.type === 'appointment') {
vm.component.end = new Date(vm.component.start.getTime());
vm.component.end.addMinutes(vm.component.delta);
oldEndDate = new Date(vm.component.end.getTime());
if (vm.component.start) {
// Preserve the delta between the start and end dates
var delta;
delta = oldStartDate.valueOf() - vm.component.start.valueOf();
if (delta !== 0) {
oldStartDate = new Date(vm.component.start.getTime());
if (vm.component.type === 'appointment') {
vm.component.end = new Date(vm.component.start.getTime());
vm.component.end.addMinutes(vm.component.delta);
oldEndDate = new Date(vm.component.end.getTime());
}
updateFreeBusy();
}
updateFreeBusy();
}
}
@@ -339,17 +340,19 @@
}
function adjustEndTime() {
// The end date must be after the start date
var delta = oldEndDate.valueOf() - vm.component.end.valueOf();
if (delta !== 0) {
if (vm.component.end) {
// The end date must be after the start date
var delta = oldEndDate.valueOf() - vm.component.end.valueOf();
if (delta !== 0) {
delta = vm.component.start.minutesTo(vm.component.end);
if (delta < 0)
vm.component.end = new Date(oldEndDate.getTime());
else {
vm.component.delta = delta;
oldEndDate = new Date(vm.component.end.getTime());
if (delta < 0)
vm.component.end = new Date(oldEndDate.getTime());
else {
vm.component.delta = delta;
oldEndDate = new Date(vm.component.end.getTime());
}
updateFreeBusy();
}
updateFreeBusy();
}
}