Skip to content
Permalink
Browse files

Datepicker: Escape single quotes in tooltips. Fixes #9049 - Datepicke…

…r beforeShowDay tooltip not displayed properly if single quote is used.
  • Loading branch information
scottgonzalez committed Feb 1, 2013
1 parent dddf2a7 commit df179542cc6593b1816d487c72c470a73940ff11
Showing with 16 additions and 1 deletion.
  1. +15 −0 tests/unit/datepicker/datepicker_options.js
  2. +1 −1 ui/jquery.ui.datepicker.js
@@ -782,6 +782,21 @@ test("callbacks", function() {
inp.datepicker("hide").datepicker("destroy");
});

test("beforeShowDay - tooltips with quotes", function() {
expect( 1 );
var inp, dp;
inp = TestHelpers.datepicker.init("#inp", {
beforeShowDay: function() {
return [ true, "", "'" ];
}
});
dp = $("#ui-datepicker-div");

inp.datepicker("show");
equal( dp.find( ".ui-datepicker-calendar td:contains('9')").attr( "title" ), "'" );
inp.datepicker("hide").datepicker("destroy");
});

test("localisation", function() {
expect( 24 );
var dp, month, day, date,
@@ -1741,7 +1741,7 @@ $.extend(Datepicker.prototype, {
(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
(printDate.getTime() === currentDate.getTime() ? " " + 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
((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "'") + "'" : "") + // cell title
(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
(otherMonth && !showOtherMonths ? " " : // display for other months
(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +

0 comments on commit df17954

Please sign in to comment.
You can’t perform that action at this time.