r2066 - trunk/ui
Author: paul.bakaus
Date: Wed Feb 11 05:40:21 2009
New Revision: 2066
Modified:
trunk/ui/ui.datepicker.js
Log:
datepicker: temporary solution for inline click events with
noConflict(true), introduces another global called DT_jQuery to deal with
the inline events (fixes #4055, going to be removed with scheduled rewrite)
Modified: trunk/ui/ui.datepicker.js
==============================================================================
--- trunk/ui/ui.datepicker.js (original)
+++ trunk/ui/ui.datepicker.js Wed Feb 11 05:40:21 2009
@@ -1292,7 +1292,7 @@
this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths,
1)),
this._getFormatConfig(inst)));
var prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
- '<a class="ui-datepicker-prev ui-corner-all"
onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', -' +
stepMonths + ', \'M\');"' +
+ '<a class="ui-datepicker-prev ui-corner-all"
onclick="DP_jQuery.datepicker._adjustDate(\'#' + inst.id + '\', -' +
stepMonths + ', \'M\');"' +
' title="' + prevText + '"><span class="ui-icon
ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText
+ '</span></a>' :
(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all
ui-state-disabled" title="'+ prevText +'"><span class="ui-icon
ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText
+ '</span></a>'));
var nextText = this._get(inst, 'nextText');
@@ -1300,16 +1300,16 @@
this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths,
1)),
this._getFormatConfig(inst)));
var next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
- '<a class="ui-datepicker-next ui-corner-all"
onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', +' +
stepMonths + ', \'M\');"' +
+ '<a class="ui-datepicker-next ui-corner-all"
onclick="DP_jQuery.datepicker._adjustDate(\'#' + inst.id + '\', +' +
stepMonths + ', \'M\');"' +
' title="' + nextText + '"><span class="ui-icon
ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText
+ '</span></a>' :
(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all
ui-state-disabled" title="'+ nextText + '"><span class="ui-icon
ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText
+ '</span></a>'));
var currentText = this._get(inst, 'currentText');
var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ?
currentDate : today);
currentText = (!navigationAsDateFormat ? currentText :
this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
- var controls = (!inst.inline ? '<button type="button"
class="ui-datepicker-close ui-state-default ui-priority-primary
ui-corner-all" onclick="jQuery.datepicker._hideDatepicker();">' +
this._get(inst, 'closeText') + '</button>' : '');
+ var controls = (!inst.inline ? '<button type="button"
class="ui-datepicker-close ui-state-default ui-priority-primary
ui-corner-all" onclick="DP_jQuery.datepicker._hideDatepicker();">' +
this._get(inst, 'closeText') + '</button>' : '');
var buttonPanel = (showButtonPanel) ? '<div
class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ?
controls : '') +
- (this._isInRange(inst, gotoDate) ? '<button type="button"
class="ui-datepicker-current ui-state-default ui-priority-secondary
ui-corner-all" onclick="jQuery.datepicker._gotoToday(\'#' + inst.id
+ '\');"' +
+ (this._isInRange(inst, gotoDate) ? '<button type="button"
class="ui-datepicker-current ui-state-default ui-priority-secondary
ui-corner-all" onclick="DP_jQuery.datepicker._gotoToday(\'#' + inst.id
+ '\');"' +
'>' + currentText + '</button>' : '') + (isRTL ? '' : controls)
+ '</div>' : '';
var firstDay = parseInt(this._get(inst, 'firstDay'),10);
firstDay = (isNaN(firstDay) ? 0 : firstDay);
@@ -1382,7 +1382,7 @@
' ' + 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="jQuery.datepicker._selectDay(\'#' +
+ (unselectable ? '' : '
onclick="DP_jQuery.datepicker._selectDay(\'#' +
inst.id + '\',' + drawMonth + ',' + drawYear + ', this);return
false;"') + '>' + // actions
(otherMonth ? (showOtherMonths ? printDate.getDate() : ' ') :
// display for other months
(unselectable ? '<span class="ui-state-default">' +
printDate.getDate() + '</span>' : '<a class="ui-state-default' +
@@ -1428,8 +1428,8 @@
var inMinYear = (minDate && minDate.getFullYear() == drawYear);
var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
monthHtml += '<select class="ui-datepicker-month" ' +
- 'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\',
this, \'M\');" ' +
- 'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+ 'onchange="DP_jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\',
this, \'M\');" ' +
+ 'onclick="DP_jQuery.datepicker._clickMonthYear(\'#' + inst.id
+ '\');"' +
'>';
for (var month = 0; month < 12; month++) {
if ((!inMinYear || month >= minDate.getMonth()) &&
@@ -1463,8 +1463,8 @@
year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) :
endYear);
html += '<select class="ui-datepicker-year" ' +
- 'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\',
this, \'Y\');" ' +
- 'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+ 'onchange="DP_jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\',
this, \'Y\');" ' +
+ 'onclick="DP_jQuery.datepicker._clickMonthYear(\'#' + inst.id
+ '\');"' +
'>';
for (; year <= endYear; year++) {
html += '<option value="' + year + '"' +
@@ -1618,5 +1618,9 @@
$.datepicker.initialized = false;
$.datepicker.uuid = new Date().getTime();
$.datepicker.version = "@VERSION";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window.DP_jQuery = $;
})(jQuery);
Topic Participants
Richard Worth