r1453 - branches/1.6rc4/ui
Author: rdworth
Date: Thu Jan 1 04:51:38 2009
New Revision: 1453
Modified:
branches/1.6rc4/ui/ui.datepicker.js
Log:
merged r1450 and r1451 to 1.6rc4
Modified: branches/1.6rc4/ui/ui.datepicker.js
==============================================================================
--- branches/1.6rc4/ui/ui.datepicker.js (original)
+++ branches/1.6rc4/ui/ui.datepicker.js Thu Jan 1 04:51:38 2009
@@ -1383,8 +1383,8 @@
' ' + this._currentClass : '') + // highlight selected day
(printDate.getTime() == today.getTime() ? '
ui-datepicker-today' : '')) + '"' + // highlight today (if different)
((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' +
daySettings[2] + '"' : '') + // cell title
- (unselectable ? '' : '
onclick="event.preventDefault();jQuery.datepicker._selectDay(\'#' +
- inst.id + '\',' + drawMonth + ',' + drawYear + ', this);"') + '>' +
// actions
+ (unselectable ? '' : ' onclick="jQuery.datepicker._selectDay(\'#' +
+ inst.id + '\',' + drawMonth + ',' + drawYear + ', this);return
false;"') + '>' + // actions
(otherMonth ? (showOtherMonths ? printDate.getDate() : ' ') :
// display for other months
(unselectable ? printDate.getDate() : '<a class="ui-state-default' +
(printDate.getTime() == today.getTime() ? '
ui-state-highlight' : '') +