From f214b708894ef2a1607050977f9698cf0d916d43 Mon Sep 17 00:00:00 2001 From: Keith Wood Date: Fri, 29 Jan 2010 08:09:03 +0000 Subject: Datepicker: Fixed conflict between beforeShowDay and getDate http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1 --- ui/jquery.ui.datepicker.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ui/jquery.ui.datepicker.js') diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index ffd20db2d..789afe1f1 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -603,6 +603,7 @@ $.extend(Datepicker.prototype, { } var beforeShow = $.datepicker._get(inst, 'beforeShow'); extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {})); + inst.lastVal = null; $.datepicker._lastInput = input; $.datepicker._setDateFromField(inst); if ($.datepicker._inDialog) // hide cursor @@ -1224,9 +1225,11 @@ $.extend(Datepicker.prototype, { /* Parse existing date and initialise date picker. */ _setDateFromField: function(inst, noDefault) { + if (inst.input.val() == inst.lastVal) { + return; + } var dateFormat = this._get(inst, 'dateFormat'); - inst.lastVal = inst.input ? inst.input.val() : null; - var dates = inst.lastVal; + var dates = inst.lastVal = inst.input ? inst.input.val() : null; var date, defaultDate; date = defaultDate = this._getDefaultDate(inst); var settings = this._getFormatConfig(inst); -- cgit v1.2.3