Merge branch 'main' into issue/2660

Author: vladbailescu

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java

@@ -191,7 +191,7 @@ private void sendResponse(InputStream stream, long size, String mimeType, String
             response.setContentLength((int) size);
         }
         if (inline) {
-            response.setHeader(CONTENT_DISPOSITION_HEADER, "inline");
+            response.setHeader(CONTENT_DISPOSITION_HEADER, "inline; filename=\"" + filename + "\"");
             response.setHeader(CSP_HEADER, "sandbox");
         } else {
             response.setHeader(CONTENT_DISPOSITION_HEADER, "attachment; filename=\"" + filename + "\"");

bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java

@@ -85,7 +85,7 @@ void testInlineAssetDownload() throws Exception {
         context.requestPathInfo().setExtension("pdf");
         downloadServlet.doGet(context.request(), context.response());
         assertTrue(context.response().containsHeader("Content-Disposition"));
-        assertEquals("inline", context.response().getHeader("Content-Disposition"));
+        assertEquals("inline; filename=\"Download_Test_PDF.pdf\"", context.response().getHeader("Content-Disposition"));
         assertTrue(context.response().containsHeader("Content-Security-Policy"));
         assertEquals("sandbox", context.response().getHeader("Content-Security-Policy"));
         assertEquals(8192, context.response().getBufferSize());

content/src/content/jcr_root/apps/core/wcm/components/form/text/v2/text/clientlibs/site/js/text.js

@@ -96,7 +96,7 @@
             }
         }
         if (displayValidationMessage) {
-            let validationMessage = event.target.parentElement.querySelector(".cmp-form-text__validation-message");
+            var validationMessage = event.target.parentElement.querySelector(".cmp-form-text__validation-message");
             if (validationMessage) {
                 validationMessage.innerText = event.target.validationMessage;
             }