Fix encoding of calendar names in Web interface

This commit is contained in:
Francis Lachapelle 2014-09-17 09:45:44 -04:00
parent ce1896b627
commit 7e281dca99

View file

@ -3572,7 +3572,7 @@ function appendCalendar(folderName, folderPath) {
li.appendChild(colorBox); li.appendChild(colorBox);
var displayName = document.createElement("span"); var displayName = document.createElement("span");
displayName.appendChild(document.createTextNode(folderName.escapeHTML())); displayName.appendChild(document.createTextNode(folderName));
li.appendChild(displayName); li.appendChild(displayName);
$(colorBox).addClassName("colorBox"); $(colorBox).addClassName("colorBox");
@ -3662,7 +3662,7 @@ function onCalendarRemove(event) {
} }
function deletePersonalCalendar(folderElement) { function deletePersonalCalendar(folderElement) {
var displayName = folderElement.childNodesWithTag("span")[0].innerHTML.strip(); var displayName = folderElement.childNodesWithTag("span")[0].innerHTML.strip().unescapeHTML();
showConfirmDialog(_("Confirmation"), showConfirmDialog(_("Confirmation"),
_("Are you sure you want to delete the calendar \"%{0}\"?").formatted(displayName), _("Are you sure you want to delete the calendar \"%{0}\"?").formatted(displayName),
deletePersonalCalendarConfirm.bind(folderElement)); deletePersonalCalendarConfirm.bind(folderElement));