mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Merge pull request #322 from kborchers/bug_5665
Datepicker: Added checks for the disabled option. Fixed #5665 - Datepicker: Disabled parameter doesn't work
This commit is contained in:
commit
4bdbab9a67
11
ui/jquery.ui.datepicker.js
vendored
11
ui/jquery.ui.datepicker.js
vendored
@ -105,7 +105,8 @@ function Datepicker() {
|
||||
altFormat: '', // The date format to use for the alternate field
|
||||
constrainInput: true, // The input is constrained by the current date format
|
||||
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['']);
|
||||
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);
|
||||
$.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. */
|
||||
@ -273,6 +278,10 @@ $.extend(Datepicker.prototype, {
|
||||
this._setDate(inst, this._getDefaultDate(inst), true);
|
||||
this._updateDatepicker(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();
|
||||
},
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user