holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure date value gets updated when popup is closed, and when framework calls set_value()

Browse Source
This commit is contained in:
Nathan Gray 2012-03-20 14:51:02 +00:00
parent 0c046b5c65
commit 11ba27722e
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etemplate/js/et2_widget_date.js
View File

@ -66,6 +66,11 @@ var et2_date = et2_inputWidget.extend({
{
this.egw().time(this.input_date);
}
// Update internal value
var self = this;
this.input_date.datepicker("option","onSelect", function(text) {
self.set_value(text);
});
},
set_type: function(_type) {
@ -109,7 +114,25 @@ var et2_date = et2_inputWidget.extend({
this.date = _value;
}
this.input_date.datepicker('setDate',this.date);
// Update input - popups do, but framework doesn't
if(this._type != 'date-timeonly')
{
this.input_date.val(jQuery.datepicker.formatDate(this.input_date.datepicker("option","dateFormat"),this.date));
}
if(this._type != 'date')
{
var current = this.input_date.val();
if(this.type != 'date-timeonly')
{
current += " ";
}
this.input_date.val(current + jQuery.datepicker.formatTime(this.input_date.datepicker("option","timeFormat"),{
hour: this.date.getHours(),
minute: this.date.getMinutes(),
seconds: this.date.getSeconds(),
timezone: this.date.getTimezoneOffset()
}));
}
},
getValue: function() {