summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2012-11-15 08:34:37 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2012-11-15 08:34:37 -0500
commit63bd242d2ee0f112075ca0bac9632e91040344cb (patch)
treec27dc74d96197409f88623a37a68dce8b242f826
parent285650a934e5262e5721526f2fa1a1dc409f32b0 (diff)
downloadjQuery-Timepicker-Addon-63bd242d2ee0f112075ca0bac9632e91040344cb.zip
jQuery-Timepicker-Addon-63bd242d2ee0f112075ca0bac9632e91040344cb.tar.gz
jQuery-Timepicker-Addon-63bd242d2ee0f112075ca0bac9632e91040344cb.tar.bz2
Raykov - date range and alternate fields
-rw-r--r--jquery-ui-timepicker-addon.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 1130a0b..9198645 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1320,9 +1320,9 @@
altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
- if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly){
+ if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null){
if(tp_inst._defaults.altFormat)
- altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, (date === null ? new Date() : date), formatCfg) + altSeparator + altFormattedDateTime;
+ altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
}
$(altField).val(altFormattedDateTime);