r884 - trunk/ui

r884 - trunk/ui


Author: kbwood.au
Date: Fri Nov 7 23:34:34 2008
New Revision: 884
Modified:
trunk/ui/ui.datepicker.js
Log:
Fixed 3547. Initialise alternate field on load for inline datepicker.
Modified: trunk/ui/ui.datepicker.js
==============================================================================
--- trunk/ui/ui.datepicker.js    (original)
+++ trunk/ui/ui.datepicker.js    Fri Nov 7 23:34:34 2008
@@ -246,6 +246,7 @@
        $.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 @@
    _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)) +