Merge pull request #864 from hargata/Hargata/856

add markdown to kiosk notes.
This commit is contained in:
Hargata Softworks
2025-02-19 09:12:37 -07:00
committed by GitHub
2 changed files with 10 additions and 3 deletions

View File

@@ -4,6 +4,7 @@
@model KioskViewModel @model KioskViewModel
@section Scripts { @section Scripts {
<script src="~/lib/masonry/masonry.min.js"></script> <script src="~/lib/masonry/masonry.min.js"></script>
<script src="~/lib/drawdown/drawdown.js"></script>
} }
<div class="progress" role="progressbar" aria-label="Refresh Progress" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="height: 1px"> <div class="progress" role="progressbar" aria-label="Refresh Progress" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="height: 1px">
<div class="progress-bar" style="width: 0%"></div> <div class="progress-bar" style="width: 0%"></div>
@@ -123,9 +124,15 @@
} }
function toggleReminderNote(sender){ function toggleReminderNote(sender){
var reminderNote = $(sender).find('.reminder-note'); var reminderNote = $(sender).find('.reminder-note');
if (reminderNote.text().trim() != ''){ var reminderNoteText = reminderNote.text().trim();
if (reminderNoteText != ''){
if (reminderNote.hasClass('d-none')) { if (reminderNote.hasClass('d-none')) {
reminderNote.removeClass('d-none'); reminderNote.removeClass('d-none');
if (!reminderNote.hasClass('reminder-note-markdown')){
let markedDownReminderNote = markdown(reminderNoteText);
reminderNote.html(markedDownReminderNote);
reminderNote.addClass('reminder-note-markdown');
}
} else { } else {
reminderNote.addClass('d-none'); reminderNote.addClass('d-none');
} }

View File

@@ -98,8 +98,8 @@
replace(rx_link, function(all, p1, p2, p3, p4, p5, p6) { replace(rx_link, function(all, p1, p2, p3, p4, p5, p6) {
stash[--si] = p4 stash[--si] = p4
? p2 ? p2
? '<img src="' + p4 + '" alt="' + p3 + '"/>' ? '<img style="max-width:100%;max-height:100%;object-fit:scale-down;" src="' + p4 + '" alt="' + p3 + '"/>'
: '<a href="' + p4 + '">' + unesc(highlight(p3)) + '</a>' : '<a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" target="_blank" href="' + p4 + '">' + unesc(highlight(p3)) + '</a>'
: p6; : p6;
return si + '\uf8ff'; return si + '\uf8ff';
}); });