diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-11-15 17:14:19 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-11-15 17:14:19 +0100 |
| commit | f86168bf6b57a06b2faa53f976976fc17cb6cc7e (patch) | |
| tree | a18bfd9cf1e75fa1417436798611bc969d9a59ad /ui/jquery.ui.datepicker.js | |
| parent | 8cbbf33192728b51d2b7a05e2a75fa334da54f26 (diff) | |
| parent | fb6119e182ece9f2b5f94eb79b8763b602d04c47 (diff) | |
| download | jquery-ui-f86168bf6b57a06b2faa53f976976fc17cb6cc7e.tar.gz jquery-ui-f86168bf6b57a06b2faa53f976976fc17cb6cc7e.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.datepicker.js')
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index c7ecafffb..e3c3bd398 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -1742,8 +1742,20 @@ $.extend(Datepicker.prototype, { _isInRange: function(inst, date) { var minDate = this._getMinMaxDate(inst, 'min'); var maxDate = this._getMinMaxDate(inst, 'max'); + var minYear = null; + var maxYear = null; + var years = this._get(inst, 'yearRange'); + if (years){ + var yearSplit = years.split(':'); + var currentYear = new Date().getFullYear(); + minYear = parseInt(yearSplit[0], 10) + currentYear; + maxYear = parseInt(yearSplit[1], 10) + currentYear; + } + return ((!minDate || date.getTime() >= minDate.getTime()) && - (!maxDate || date.getTime() <= maxDate.getTime())); + (!maxDate || date.getTime() <= maxDate.getTime()) && + (!minYear || date.getFullYear() >= minYear) && + (!maxYear || date.getFullYear() <= maxYear)); }, /* Provide the configuration settings for formatting/parsing. */ |