From 703fda3812ac451c281270156bf1575aec54184f Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Nov 2024 22:06:01 +0800
Subject: [PATCH] :bug:

---
 app/src/asset/pdf/pdf_print_service.js | 5 +++--
 app/src/util/escape.ts                 | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/asset/pdf/pdf_print_service.js b/app/src/asset/pdf/pdf_print_service.js
index 4beba20e3..103777d99 100644
--- a/app/src/asset/pdf/pdf_print_service.js
+++ b/app/src/asset/pdf/pdf_print_service.js
@@ -316,13 +316,14 @@ function renderProgress(index, total) {
   progressPerc.setAttribute("data-l10n-args", JSON.stringify({ progress }));
 }
 
+/* NOTE
 window.addEventListener(
   "keydown",
   function (event) {
     // Intercept Cmd/Ctrl + P in all browsers.
     // Also intercept Cmd/Ctrl + Shift + P in Chrome and Opera
     if (
-      event.keyCode === /* P= */ 80 &&
+      event.keyCode === 80 &&
       (event.ctrlKey || event.metaKey) &&
       !event.altKey &&
       (!event.shiftKey || window.chrome || window.opera)
@@ -334,7 +335,7 @@ window.addEventListener(
     }
   },
   true
-);
+);*/
 
 if ("onbeforeprint" in window) {
   // Do not propagate before/afterprint events when they are not triggered
diff --git a/app/src/util/escape.ts b/app/src/util/escape.ts
index e9471515c..41a0f4bb2 100644
--- a/app/src/util/escape.ts
+++ b/app/src/util/escape.ts
@@ -17,6 +17,9 @@ export const escapeAttr = (html: string) => {
 };
 
 export const escapeAriaLabel = (html: string) => {
+    if (!html) {
+        return html;
+    }
     return html.replace(/"/g, "&quot;").replace(/'/g, "&apos;")
         .replace(/</g, "&amp;lt;").replace(/&lt;/g, "&amp;lt;");
 };