cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into Hargata/further.improvements

Browse Source 
# Conflicts:
#	wwwroot/js/garage.js
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2024-02-14 09:21:16 -07:00
parent f6493f0496 c2d61eecc0
commit 29825a6ad6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wwwroot/js/garage.js
View File

@@ -71,13 +71,13 @@ function generateReminderItem(id, urgency, description) {
}
switch (urgency) {
case "VeryUrgent":
return `<p class="badge text-wrap bg-danger reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${description}</p>`;
return `<p class="badge text-wrap bg-danger reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
case "PastDue":
return `<p class="badge text-wrap bg-secondary reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${description}</p>`;
return `<p class="badge text-wrap bg-secondary reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
case "Urgent":
return `<p class="badge text-wrap bg-warning reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${description}</p>`;
return `<p class="badge text-wrap bg-warning reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
case "NotUrgent":
return `<p class="badge text-wrap bg-success reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${description}</p>`;
return `<p class="badge text-wrap bg-success reminder-calendar-item" onclick='showCalendarReminderModal(${id})'>${encodeHTMLInput(description)}</p>`;
}
}
function initCalendar() {

5
wwwroot/js/shared.js
View File

@@ -160,6 +160,11 @@ function bindWindowResize() {
hideMobileNav();
});
}
function encodeHTMLInput(input) {
const encoded = document.createElement('div');
encoded.innerText = input;
return encoded.innerHTML;
}
function decodeHTMLEntities(text) {
return $("<textarea/>")
.html(text)