library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #322 from kborchers/bug_5665

Browse Source 
Datepicker: Added checks for the disabled option. Fixed #5665 - Datepicker: Disabled parameter doesn't work
This commit is contained in:
Corey Frang 2011-06-16 00:40:10 -07:00
commit 4bdbab9a67
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/jquery.ui.datepicker.js vendored
View File

@ -105,7 +105,8 @@ function Datepicker() {
altFormat: '', // The date format to use for the alternate field altFormat: '', // The date format to use for the alternate field
constrainInput: true, // The input is constrained by the current date format constrainInput: true, // The input is constrained by the current date format
showButtonPanel: false, // True to show button panel, false to not show it showButtonPanel: false, // True to show button panel, false to not show it
autoSize: false // True to size the input for the date format, false to leave as is autoSize: false, // True to size the input for the date format, false to leave as is
disabled: false // The initial disabled state
}; };
$.extend(this._defaults, this.regional['']); $.extend(this._defaults, this.regional['']);
this.dpDiv = bindHover($('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')); this.dpDiv = bindHover($('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'));
@ -194,6 +195,10 @@ $.extend(Datepicker.prototype, {
}); });
this._autoSize(inst); this._autoSize(inst);
$.data(target, PROP_NAME, inst); $.data(target, PROP_NAME, inst);
//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
if( inst.settings.disabled ) {
this._disableDatepicker( target );
}
}, },
/* Make attachments based on settings. */ /* Make attachments based on settings. */
@ -273,6 +278,10 @@ $.extend(Datepicker.prototype, {
this._setDate(inst, this._getDefaultDate(inst), true); this._setDate(inst, this._getDefaultDate(inst), true);
this._updateDatepicker(inst); this._updateDatepicker(inst);
this._updateAlternate(inst); this._updateAlternate(inst);
//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
if( inst.settings.disabled ) {
this._disableDatepicker( target );
}
inst.dpDiv.show(); inst.dpDiv.show();
}, },