aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKeith Wood <kbwood.au@gmail.com>2008-11-08 07:34:34 +0000
committerKeith Wood <kbwood.au@gmail.com>2008-11-08 07:34:34 +0000
commit3946038509d16f1fef4214312f09bac94e17a4cd (patch)
tree7091df027b6832d6a04451e381ff83b3aa578236 /ui
parent4addec6ac26ff479f920607b258dabacf2ff481a (diff)
downloadjquery-ui-3946038509d16f1fef4214312f09bac94e17a4cd.tar.gz
jquery-ui-3946038509d16f1fef4214312f09bac94e17a4cd.zip
Fixed 3547. Initialise alternate field on load for inline datepicker.
Diffstat (limited to 'ui')
-rw-r--r--ui/ui.datepicker.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js
index ad6b8194f..573e18d65 100644
--- a/ui/ui.datepicker.js
+++ b/ui/ui.datepicker.js
@@ -246,6 +246,7 @@ $.extend(Datepicker.prototype, {
$.data(target, PROP_NAME, inst);
this._setDate(inst, this._getDefaultDate(inst));
this._updateDatepicker(inst);
+ this._updateAlternate(inst);
},
/* Tidy up after displaying the date picker. */
@@ -867,7 +868,7 @@ $.extend(Datepicker.prototype, {
_updateAlternate: function(inst) {
var altField = this._get(inst, 'altField');
if (altField) { // update alternate field too
- var altFormat = this._get(inst, 'altFormat');
+ var altFormat = this._get(inst, 'altFormat') || this._get(inst, 'dateFormat');
var date = this._getDate(inst);
dateStr = (isArray(date) ? (!date[0] && !date[1] ? '' :
this.formatDate(altFormat, date[0], this._getFormatConfig(inst)) +