Skip to content

Datepicker: Various *Text options no longer accept HTML input [SO-2932013] #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Datepicker: Various *Text options no longer accept HTML input [SO-2932013] #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9444fcf
Datepicker: Make sure altField is treated as a CSS selector [SO-2932013]
Jun 24, 2022
570cde4
Datepicker: Make sure text option are text, shorten HTML strings [SO-…
Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 116 additions & 22 deletions ui/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@ $.extend(Datepicker.prototype, {
inst.append.remove();
}
if (appendText) {
inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
inst.append = $("<span>")
.addClass(this._appendClass)
.text(appendText);
input[isRTL ? "before" : "after"](inst.append);
}

Expand All @@ -244,12 +246,32 @@ $.extend(Datepicker.prototype, {
if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
buttonText = this._get(inst, "buttonText");
buttonImage = this._get(inst, "buttonImage");
inst.trigger = $(this._get(inst, "buttonImageOnly") ?
$("<img/>").addClass(this._triggerClass).
attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
$("<button type='button'></button>").addClass(this._triggerClass).
html(!buttonImage ? buttonText : $("<img/>").attr(
{ src:buttonImage, alt:buttonText, title:buttonText })));

if (this._get(inst, "buttonImageOnly")) {
inst.trigger = $("<img>")
.addClass(this._triggerClass)
.attr({
src: buttonImage,
alt: buttonText,
title: buttonText
});
} else {
inst.trigger = $("<button type='button'>")
.addClass(this._triggerClass);
if (buttonImage) {
inst.trigger.html(
$("<img>")
.attr({
src: buttonImage,
alt: buttonText,
title: buttonText
})
);
} else {
inst.trigger.text(buttonText);
}
}

input[isRTL ? "before" : "after"](inst.trigger);
inst.trigger.click(function() {
if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
Expand Down Expand Up @@ -1071,7 +1093,7 @@ $.extend(Datepicker.prototype, {
altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
date = this._getDate(inst);
dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
$(altField).each(function() { $(this).val(dateStr); });
$(document).find(altField).val(dateStr);
}
},

Expand Down Expand Up @@ -1676,32 +1698,104 @@ $.extend(Datepicker.prototype, {
this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
this._getFormatConfig(inst)));

prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
" 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>"));
if (this._canAdjustMonth(inst, -1, drawYear, drawMonth)) {
prev = $("<a>")
.attr({
"class": "ui-datepicker-prev ui-corner-all",
"data-handler": "prev",
"data-event": "click",
title: prevText
})
.append(
$("<span>")
.addClass("ui-icon ui-icon-circle-triangle-" +
(isRTL ? "e" : "w"))
.text(prevText)
)[0].outerHTML;
} else if (hideIfNoPrevNext) {
prev = "";
} else {
prev = $("<a>")
.attr({
"class": "ui-datepicker-prev ui-corner-all ui-state-disabled",
title: prevText
})
.append(
$("<span>")
.addClass("ui-icon ui-icon-circle-triangle-" +
(isRTL ? "e" : "w"))
.text(prevText)
)[0].outerHTML;
}

nextText = this._get(inst, "nextText");
nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
this._getFormatConfig(inst)));

next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
" 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>"));
if (this._canAdjustMonth(inst, +1, drawYear, drawMonth)) {
next = $("<a>")
.attr({
"class": "ui-datepicker-next ui-corner-all",
"data-handler": "next",
"data-event": "click",
title: nextText
})
.append(
$("<span>")
.addClass("ui-icon ui-icon-circle-triangle-" +
(isRTL ? "w" : "e"))
.text(nextText)
)[0].outerHTML;
} else if (hideIfNoPrevNext) {
next = "";
} else {
next = $("<a>")
.attr({
"class": "ui-datepicker-next ui-corner-all ui-state-disabled",
title: nextText
})
.append(
$("<span>")
.attr("class", "ui-icon ui-icon-circle-triangle-" +
(isRTL ? "w" : "e"))
.text(nextText)
)[0].outerHTML;
}

currentText = this._get(inst, "currentText");
gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
currentText = (!navigationAsDateFormat ? currentText :
this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));

controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
this._get(inst, "closeText") + "</button>" : "");

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' data-handler='today' data-event='click'" +
">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
controls = "";
if (!inst.inline) {
controls = $("<button>")
.attr({
type: "button",
"class": "ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all",
"data-handler": "hide",
"data-event": "click"
})
.text(this._get(inst, "closeText"))[0].outerHTML;
}

buttonPanel = "";
if (showButtonPanel) {
buttonPanel = $("<div class='ui-datepicker-buttonpane ui-widget-content'>")
.append(isRTL ? controls : "")
.append(this._isInRange(inst, gotoDate) ?
$("<button>")
.attr({
type: "button",
"class": "ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all",
"data-handler": "today",
"data-event": "click"
})
.text(currentText) :
"")
.append(isRTL ? "" : controls)[0].outerHTML;
}

firstDay = parseInt(this._get(inst, "firstDay"),10);
firstDay = (isNaN(firstDay) ? 0 : firstDay);
Expand Down