deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Whitespace and getDate/setDate fixes

Browse source 
Extra tabs removed and line endings cleaned
getDate is now properly accessible from $(target).datepicker('getDate') and correctly returns date object with time
setDate is now properly accessible from $(target).datepicker('setDate') and can set both date and time
added new method setTime, accessible from $(target).datepicker('setTime')
calling .datepicker('setDate') with no date now sets the default date as in original datepicker code
time is set to default when calling .datepicker('setTime') with no time or calling 'setDate' with a date and no time
added new internal function _parseTime to parse string times from any source
This commit is contained in:
doublerebel 2010-11-21 15:48:55 -08:00
parent badcc050c4
commit 689ba11c35
1 changed files with 108 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
jquery-ui-timepicker-addon.js vendored
View file

@ -2,7 +2,7 @@
* jQuery timepicker addon * jQuery timepicker addon
* By: Trent Richardson [http://trentrichardson.com] * By: Trent Richardson [http://trentrichardson.com]
* Version 0.8.1 * Version 0.8.1
* Last Modified: 11/20/2010 by Charles Phillips * Last Modified: 11/21/2010 by Charles Phillips
* *
* Copyright 2010 Trent Richardson * Copyright 2010 Trent Richardson
* Dual licensed under the MIT and GPL licenses. * Dual licensed under the MIT and GPL licenses.
@ -18,7 +18,7 @@
*/ */
(function($) { (function($) {
$.extend($.ui, { timepicker: { version: "0.8.1" } }); $.extend($.ui, { timepicker: { version: "0.8.1" } });
/* Time picker manager. /* Time picker manager.
@ -80,7 +80,7 @@ $.extend(Timepicker.prototype, {
formattedDate: '', formattedDate: '',
formattedTime: '', formattedTime: '',
formattedDateTime: '', formattedDateTime: '',
/* Override the default settings for all instances of the time picker. /* Override the default settings for all instances of the time picker.
@param settings object - the new settings to use as defaults (anonymous object) @param settings object - the new settings to use as defaults (anonymous object)
@return the manager object */ @return the manager object */
@ -95,7 +95,7 @@ $.extend(Timepicker.prototype, {
_newInst: function($input, o) { _newInst: function($input, o) {
var tp_inst = new Timepicker(), var tp_inst = new Timepicker(),
inlineSettings = {}; inlineSettings = {};
for (var attrName in tp_inst._defaults) { for (var attrName in tp_inst._defaults) {
var attrValue = $input.attr('time:' + attrName); var attrValue = $input.attr('time:' + attrName);
if (attrValue) { if (attrValue) {
@ -148,18 +148,27 @@ $.extend(Timepicker.prototype, {
var currDT = (this.$altInput) ? var currDT = (this.$altInput) ?
this.$input.val() + ' ' + this.$altInput.val() : this.$input.val() + ' ' + this.$altInput.val() :
this.$input.val(), this.$input.val(),
parsedDT = this._parseTime(currDT);
regstr = this._defaults.timeFormat.toString()
this.timeDefined = (parsedDT) ? true : false;
this._injectTimePicker();
},
//########################################################################
// parse the time string from input value or _setTime
//########################################################################
_parseTime: function(timeString, withDate) {
var regstr = this._defaults.timeFormat.toString()
.replace(/h{1,2}/ig, '(\\d?\\d)') .replace(/h{1,2}/ig, '(\\d?\\d)')
.replace(/m{1,2}/ig, '(\\d?\\d)') .replace(/m{1,2}/ig, '(\\d?\\d)')
.replace(/s{1,2}/ig, '(\\d?\\d)') .replace(/s{1,2}/ig, '(\\d?\\d)')
.replace(/t{1,2}/ig, '(am|pm|a|p)?') .replace(/t{1,2}/ig, '(am|pm|a|p)?')
.replace(/\s/g, '\\s?') + '$', .replace(/\s/g, '\\s?') + '$',
treg = currDT.match(new RegExp(regstr, 'i')), treg = timeString.match(new RegExp(regstr, 'i')),
order = this._getFormatPositions(); order = this._getFormatPositions();
if (!this._defaults.timeOnly) { if (withDate || !this._defaults.timeOnly) {
// the time should come after x number of characters and a space. // the time should come after x number of characters and a space.
// x = at least the length of text specified by the date format // x = at least the length of text specified by the date format
var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
@ -183,9 +192,6 @@ $.extend(Timepicker.prototype, {
if (order.m !== -1) this.minute = treg[order.m]; if (order.m !== -1) this.minute = treg[order.m];
if (order.s !== -1) this.second = treg[order.s]; if (order.s !== -1) this.second = treg[order.s];
} }
this.timeDefined = (treg) ? true : false;
this._injectTimePicker();
}, },
//######################################################################## //########################################################################
@ -237,7 +243,7 @@ $.extend(Timepicker.prototype, {
html += '<dd class="ui_tpicker_hour">' + html += '<dd class="ui_tpicker_hour">' +
'<div id="ui_tpicker_hour_' + dp_id + '"' + ((o.showHour) ? '' : noDisplay) + '></div>' + '<div id="ui_tpicker_hour_' + dp_id + '"' + ((o.showHour) ? '' : noDisplay) + '></div>' +
'<div style="padding-left: 1px"><table><tr>'; '<div style="padding-left: 1px"><table><tr>';
for (var h = o.hourMin; h < hourMax; h += o.hourGrid) { for (var h = o.hourMin; h < hourMax; h += o.hourGrid) {
hourGridSize++; hourGridSize++;
var tmph = (o.ampm && h > 12) ? h-12 : h; var tmph = (o.ampm && h > 12) ? h-12 : h;
@ -249,45 +255,45 @@ $.extend(Timepicker.prototype, {
} }
html += '<td>' + tmph + '</td>'; html += '<td>' + tmph + '</td>';
} }
html += '</tr></table></div>' + html += '</tr></table></div>' +
'</dd>'; '</dd>';
} else html += '<dd class="ui_tpicker_hour" id="ui_tpicker_hour_' + dp_id + '"' + } else html += '<dd class="ui_tpicker_hour" id="ui_tpicker_hour_' + dp_id + '"' +
((o.showHour) ? '' : noDisplay) + '></dd>'; ((o.showHour) ? '' : noDisplay) + '></dd>';
html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' + html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'; ((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>';
if (o.showMinute && o.minuteGrid > 0) { if (o.showMinute && o.minuteGrid > 0) {
html += '<dd class="ui_tpicker_minute ui_tpicker_minute_' + o.minuteGrid + '">' + html += '<dd class="ui_tpicker_minute ui_tpicker_minute_' + o.minuteGrid + '">' +
'<div id="ui_tpicker_minute_' + dp_id + '"' + '<div id="ui_tpicker_minute_' + dp_id + '"' +
((o.showMinute) ? '' : noDisplay) + '></div>' + ((o.showMinute) ? '' : noDisplay) + '></div>' +
'<div style="padding-left: 1px"><table><tr>'; '<div style="padding-left: 1px"><table><tr>';
for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) { for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) {
minuteGridSize++; minuteGridSize++;
html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>'; html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
} }
html += '</tr></table></div>' + html += '</tr></table></div>' +
'</dd>'; '</dd>';
} else html += '<dd class="ui_tpicker_minute" id="ui_tpicker_minute_' + dp_id + '"' + } else html += '<dd class="ui_tpicker_minute" id="ui_tpicker_minute_' + dp_id + '"' +
((o.showMinute) ? '' : noDisplay) + '></dd>'; ((o.showMinute) ? '' : noDisplay) + '></dd>';
html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' + html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'; ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>';
if (o.showSecond && o.secondGrid > 0) { if (o.showSecond && o.secondGrid > 0) {
html += '<dd class="ui_tpicker_second ui_tpicker_second_' + o.secondGrid + '">' + html += '<dd class="ui_tpicker_second ui_tpicker_second_' + o.secondGrid + '">' +
'<div id="ui_tpicker_second_' + dp_id + '"' + '<div id="ui_tpicker_second_' + dp_id + '"' +
((o.showSecond) ? '' : noDisplay) + '></div>' + ((o.showSecond) ? '' : noDisplay) + '></div>' +
'<div style="padding-left: 1px"><table><tr>'; '<div style="padding-left: 1px"><table><tr>';
for (var s = o.secondMin; s < secMax; s += o.secondGrid) { for (var s = o.secondMin; s < secMax; s += o.secondGrid) {
secondGridSize++; secondGridSize++;
html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>'; html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
} }
html += '</tr></table></div>' + html += '</tr></table></div>' +
'</dd>'; '</dd>';
} else html += '<dd class="ui_tpicker_second" id="ui_tpicker_second_' + dp_id + '"' + } else html += '<dd class="ui_tpicker_second" id="ui_tpicker_second_' + dp_id + '"' +
@ -295,7 +301,7 @@ $.extend(Timepicker.prototype, {
html += '</dl></div>'; html += '</dl></div>';
$tp = $(html); $tp = $(html);
// if we only want time picker... // if we only want time picker...
if (o.timeOnly === true) { if (o.timeOnly === true) {
$tp.prepend( $tp.prepend(
@ -304,7 +310,7 @@ $.extend(Timepicker.prototype, {
'</div>'); '</div>');
$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide(); $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
} }
this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({ this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
orientation: "horizontal", orientation: "horizontal",
value: this.hour, value: this.hour,
@ -316,7 +322,7 @@ $.extend(Timepicker.prototype, {
tp_inst._onTimeChange(); tp_inst._onTimeChange();
} }
}); });
// Updated by Peter Medeiros: // Updated by Peter Medeiros:
// - Pass in Event and UI instance into slide function // - Pass in Event and UI instance into slide function
this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({ this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
@ -331,7 +337,7 @@ $.extend(Timepicker.prototype, {
tp_inst._onTimeChange(); tp_inst._onTimeChange();
} }
}); });
this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({ this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
orientation: "horizontal", orientation: "horizontal",
value: this.second, value: this.second,
@ -343,11 +349,13 @@ $.extend(Timepicker.prototype, {
tp_inst._onTimeChange(); tp_inst._onTimeChange();
} }
}); });
// Add grid functionality // Add grid functionality
if (o.showHour && o.hourGrid > 0) { if (o.showHour && o.hourGrid > 0) {
size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin); size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
$tp.find(".ui_tpicker_hour table").css({ $tp.find(".ui_tpicker_hour table").css({
width: size + "%", width: size + "%",
marginLeft: (size / (-2 * hourGridSize)) + "%", marginLeft: (size / (-2 * hourGridSize)) + "%",
@ -374,7 +382,8 @@ $.extend(Timepicker.prototype, {
}); });
}); });
} }
if (o.showMinute && o.minuteGrid > 0) { if (o.showMinute && o.minuteGrid > 0) {
size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin); size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
$tp.find(".ui_tpicker_minute table").css({ $tp.find(".ui_tpicker_minute table").css({
@ -393,7 +402,7 @@ $.extend(Timepicker.prototype, {
}); });
}); });
} }
if (o.showSecond && o.secondGrid > 0) { if (o.showSecond && o.secondGrid > 0) {
$tp.find(".ui_tpicker_second table").css({ $tp.find(".ui_tpicker_second table").css({
width: size + "%", width: size + "%",
@ -415,9 +424,9 @@ $.extend(Timepicker.prototype, {
var $buttonPanel = $dp.find('.ui-datepicker-buttonpane'); var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
if ($buttonPanel.length) $buttonPanel.before($tp); if ($buttonPanel.length) $buttonPanel.before($tp);
else $dp.append($tp); else $dp.append($tp);
this.$timeObj = $('#ui_tpicker_time_'+ dp_id); this.$timeObj = $('#ui_tpicker_time_'+ dp_id);
if (this.inst !== null) { if (this.inst !== null) {
var timeDefined = this.timeDefined; var timeDefined = this.timeDefined;
this._onTimeChange(); this._onTimeChange();
@ -437,7 +446,7 @@ $.extend(Timepicker.prototype, {
ampm = (hour < 11.5) ? 'AM' : 'PM', ampm = (hour < 11.5) ? 'AM' : 'PM',
hasChanged = false; hasChanged = false;
hour = (hour >= 11.5 && hour < 12) ? 12 : hour; hour = (hour >= 11.5 && hour < 12) ? 12 : hour;
// If the update was done in the input field, this field should not be updated. // If the update was done in the input field, this field should not be updated.
// If the update was done using the sliders, update the input field. // If the update was done using the sliders, update the input field.
if (force || this.hour != hour || this.minute != minute || this.second != second || (this.ampm.length > 0 && this.ampm != ampm)) if (force || this.hour != hour || this.minute != minute || this.second != second || (this.ampm.length > 0 && this.ampm != ampm))
@ -503,7 +512,7 @@ $.extend(Timepicker.prototype, {
timeAvailable = dt !== null && this.timeDefined; timeAvailable = dt !== null && this.timeDefined;
this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg); this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
var formattedDateTime = this.formattedDate; var formattedDateTime = this.formattedDate;
if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
return; return;
@ -512,11 +521,11 @@ $.extend(Timepicker.prototype, {
if (this.$altInput) this.$altInput.val(this.formattedTime); if (this.$altInput) this.$altInput.val(this.formattedTime);
else formattedDateTime += ' ' + this.formattedTime; else formattedDateTime += ' ' + this.formattedTime;
} }
this.formattedDateTime = formattedDateTime; this.formattedDateTime = formattedDateTime;
this.$input.val(formattedDateTime).trigger("change"); this.$input.val(formattedDateTime).trigger("change");
} }
}); });
$.fn.extend({ $.fn.extend({
@ -526,9 +535,9 @@ $.fn.extend({
timepicker: function(o) { timepicker: function(o) {
o = o || {}; o = o || {};
var tmp_args = arguments; var tmp_args = arguments;
if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true }); if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
return $(this).each(function() { return $(this).each(function() {
$.fn.datetimepicker.apply($(this), tmp_args); $.fn.datetimepicker.apply($(this), tmp_args);
}); });
@ -536,12 +545,13 @@ $.fn.extend({
//######################################################################## //########################################################################
// extend timepicker to datepicker // extend timepicker to datepicker
//######################################################################## //########################################################################
datetimepicker: function(o) { datetimepicker: function(o) {
o = o || {}; o = o || {};
var $input = this, var $input = this,
tmp_args = arguments; tmp_args = arguments;
if (typeof(o) == 'string'){ if (typeof(o) == 'string'){
if(o == 'getDate') if(o == 'getDate')
return $.fn.datepicker.apply($(this), tmp_args); return $.fn.datepicker.apply($(this), tmp_args);
@ -564,16 +574,16 @@ $.fn.extend({
$.datepicker._base_selectDate = $.datepicker._selectDate; $.datepicker._base_selectDate = $.datepicker._selectDate;
$.datepicker._selectDate = function (id, dateStr) { $.datepicker._selectDate = function (id, dateStr) {
var inst = this._getInst($(id)[0]), var inst = this._getInst($(id)[0]),
tp_inst = $.datepicker._get(inst, 'timepicker'); tp_inst = this._get(inst, 'timepicker');
if (tp_inst) { if (tp_inst) {
inst.inline = inst.stay_open = true; inst.inline = inst.stay_open = true;
inst.stay_open = inst.inline = false; inst.stay_open = inst.inline = false;
$.datepicker._base_selectDate(id, dateStr); this._base_selectDate(id, dateStr);
this._notifyChange(inst); this._notifyChange(inst);
this._updateDatepicker(inst); this._updateDatepicker(inst);
} }
else $.datepicker._base_selectDate(id, dateStr); else this._base_selectDate(id, dateStr);
}; };
//############################################################################################# //#############################################################################################
@ -621,7 +631,7 @@ $.datepicker._doKeyPress = function(event) {
return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1);
} }
} else return $.datepicker._base_doKeyPress(event); } else return $.datepicker._base_doKeyPress(event);
}; };
//####################################################################################### //#######################################################################################
@ -631,7 +641,7 @@ $.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
$.datepicker._doKeyUp = function (event) { $.datepicker._doKeyUp = function (event) {
var inst = $.datepicker._getInst(event.target), var inst = $.datepicker._getInst(event.target),
tp_inst = $.datepicker._get(inst, 'timepicker'); tp_inst = $.datepicker._get(inst, 'timepicker');
if (tp_inst) { if (tp_inst) {
if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) { if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
try { try {
@ -642,7 +652,7 @@ $.datepicker._doKeyUp = function (event) {
} }
} }
} }
return $.datepicker._base_doKeyUp(event); return $.datepicker._base_doKeyUp(event);
}; };
@ -651,7 +661,7 @@ $.datepicker._doKeyUp = function (event) {
//####################################################################################### //#######################################################################################
$.datepicker._base_gotoToday = $.datepicker._gotoToday; $.datepicker._base_gotoToday = $.datepicker._gotoToday;
$.datepicker._gotoToday = function(id) { $.datepicker._gotoToday = function(id) {
$.datepicker._base_gotoToday(id); this._base_gotoToday(id);
this._setTime(this._getInst($(id)[0]), new Date()); this._setTime(this._getInst($(id)[0]), new Date());
}; };
@ -659,61 +669,78 @@ $.datepicker._gotoToday = function(id) {
// Create our own set time function // Create our own set time function
//####################################################################################### //#######################################################################################
$.datepicker._setTime = function(inst, date) { $.datepicker._setTime = function(inst, date) {
var tp_inst = $.datepicker._get(inst, 'timepicker'); var tp_inst = this._get(inst, 'timepicker');
if (tp_inst) { if (tp_inst) {
var hour = date.getHours(), var defaults = tp_inst._defaults,
minute = date.getMinutes(), // calling _setTime with no date sets time to defaults
second = date.getSeconds(); hour = date ? date.getHours() : defaults.hour,
minute = date ? date.getMinutes() : defaults.minute,
second = date ? date.getSeconds() : defaults.second;
//check if within min/max times.. //check if within min/max times..
if ((hour < tp_inst._defaults.hourMin || hour > tp_inst._defaults.hourMax) || (minute < tp_inst._defaults.minuteMin || minute > tp_inst._defaults.minuteMax) || (second < tp_inst._defaults.secondMin || second > tp_inst._defaults.secondMax)) { if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax)) {
hour = tp_inst._defaults.hourMin; hour = defaults.hourMin;
minute = tp_inst._defaults.minuteMin; minute = defaults.minuteMin;
second = tp_inst._defaults.secondMin; second = defaults.secondMin;
} }
if (tp_inst.hour_slider && tp_inst.minute_slider && tp_inst.second_slider) { if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
tp_inst.hour_slider.slider('value', hour); else tp_inst.hour = hour;
tp_inst.minute_slider.slider('value', minute); if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
tp_inst.second_slider.slider('value', second); else tp_inst.minute = minute;
} else { if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
tp_inst.hour = hour; else tp_inst.second = second;
tp_inst.minute = minute;
tp_inst.second = second;
}
tp_inst._onTimeChange(true); tp_inst._onTimeChange(true);
} }
}; };
//####################################################################################### //#######################################################################################
// override setDate() to allow getting time too within Date object // Create new public method to set only time, callable as $().datepicker('setTime', date)
//####################################################################################### //#######################################################################################
$.datepicker._base_setDate = $.datepicker._setDate; $.datepicker._setTimeDatepicker = function(target, date, withDate) {
$.datepicker._setDate = function(inst, date, noChange) { var inst = this._getInst(target),
date = date || new Date(); tp_inst = this._get(inst, 'timepicker');
var tp_inst = $.datepicker._get(inst, 'timepicker'),
tp_date = new Date(date.getTime()); if (tp_inst) {
var tp_date;
$.datepicker._updateDatepicker(inst); if (date) {
$.datepicker._base_setDate(inst, date, noChange); if (typeof date == "string") {
if (tp_inst) this._setTime(inst, tp_date); tp_inst._parseTime(date, withDate);
tp_date = new Date();
tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second);
}
else tp_date = new Date(date.getTime());
if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
}
this._setTime(inst, tp_date);
}
};
//#######################################################################################
// override setDate() to allow setting time too within Date object
//#######################################################################################
$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
$.datepicker._setDateDatepicker = function(target, date) {
this._base_setDateDatepicker.apply(this, arguments);
this._setTimeDatepicker(target, date, true);
}; };
//####################################################################################### //#######################################################################################
// override getDate() to allow getting time too within Date object // override getDate() to allow getting time too within Date object
//####################################################################################### //#######################################################################################
$.datepicker._base_getDate = $.datepicker._getDate; $.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
$.datepicker._getDate = function(inst) { $.datepicker._getDateDatepicker = function(target, noDefault) {
var tp_inst = $.datepicker._get(inst, 'timepicker'); var inst = this._getInst(target),
tp_inst = this._get(inst, 'timepicker');
if (tp_inst) if (tp_inst)
return (!inst.currentYear || (inst.input && inst.input.val() == '')) ? return (!inst.currentYear || (inst.input && inst.input.val() == '')) ?
null : null :
(new Date(inst.currentYear, inst.currentMonth, inst.currentDay, tp_inst.hour, tp_inst.minute, tp_inst.second)); (new Date(inst.currentYear, inst.currentMonth, inst.currentDay, tp_inst.hour, tp_inst.minute, tp_inst.second));
else return $.datepicker._base_getDate(inst); else return this._base_getDateDatepicker(inst);
}; };
//####################################################################################### //#######################################################################################
// jQuery extend now ignores nulls! // jQuery extend now ignores nulls!