extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 06:48:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not working data arithmetic, after change from timestamps to strings in date widget

Browse Source
This commit is contained in:
Ralf Becker 2014-08-21 12:43:14 +00:00
parent cb4b0a9532
commit cfd28ae9a9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calendar/js/app.js
View File

@ -119,7 +119,7 @@ app.classes.calendar = AppJS.extend(
break; break;
} }
}, },
/** /**
* Observer method receives update notifications from all applications * Observer method receives update notifications from all applications
* *
@ -175,9 +175,9 @@ app.classes.calendar = AppJS.extend(
} }
} }
break; break;
} }
}, },
/** /**
* Link hander for jDots template to just reload our iframe, instead of reloading whole admin app * Link hander for jDots template to just reload our iframe, instead of reloading whole admin app
* *
@ -720,7 +720,7 @@ app.classes.calendar = AppJS.extend(
{ {
this.egw.open_link(this.egw.link("/index.php",vars),'_blank','700x700'); this.egw.open_link(this.egw.link("/index.php",vars),'_blank','700x700');
}, },
/** /**
* control delete_series popup visibility * control delete_series popup visibility
* *
@ -755,7 +755,7 @@ app.classes.calendar = AppJS.extend(
id: 'dialog[cancel]', id: 'dialog[cancel]',
image: 'cancel' image: 'cancel'
} }
]; ];
var self = this; var self = this;
et2_dialog.show_dialog et2_dialog.show_dialog
@ -988,7 +988,7 @@ app.classes.calendar = AppJS.extend(
{ {
// nm action - show popup // nm action - show popup
nm_open_popup(_action,_senders); nm_open_popup(_action,_senders);
} }
return; return;
} }
@ -1244,7 +1244,6 @@ app.classes.calendar = AppJS.extend(
var alarm_date = this.et2.getWidgetById('new_alarm[date]'); var alarm_date = this.et2.getWidgetById('new_alarm[date]');
var alarm_options = _widget || this.et2.getWidgetById('new_alarm[options]'); var alarm_options = _widget || this.et2.getWidgetById('new_alarm[options]');
var start = this.et2.getWidgetById('start'); var start = this.et2.getWidgetById('start');
var date = 0;
if (alarm_date && alarm_options if (alarm_date && alarm_options
&& start) && start)
@ -1260,7 +1259,8 @@ app.classes.calendar = AppJS.extend(
var startDate = start.get_value(); var startDate = start.get_value();
if (startDate) if (startDate)
{ {
date = startDate - parseInt(alarm_options.get_value()); var date = new Date(startDate);
date.setTime(date.getTime() - parseInt(alarm_options.get_value()));
alarm_date.set_value(date); alarm_date.set_value(date);
} }
} }