From 28627c809fc7ba84b743ded9abb8ec1937390970 Mon Sep 17 00:00:00 2001 From: Luca Fuser Date: Wed, 13 Nov 2024 14:16:52 +0100 Subject: [PATCH 1/2] magento/magento2#38892: Email template store-switcher - Fix issue with jQuery deprecated load method --- .../view/adminhtml/templates/preview/iframeswitcher.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml index 99342fd9d81ba..40658608305bf 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml +++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml @@ -55,7 +55,7 @@ function unBlockPreview() { jQuery(document).ready(preview); jQuery(previewIframe).ready(unBlockPreview); -jQuery("#preview_iframe").load(function() { +jQuery("#preview_iframe").on('load', function() { jQuery(this).height(jQuery(this).contents().find("html").height() ); }); From a7950bfce939805bcde76994b12b211b2d403291 Mon Sep 17 00:00:00 2001 From: Luca Fuser Date: Tue, 28 Jan 2025 09:56:13 +0100 Subject: [PATCH 2/2] Code sniffer fix escaper and copyright error --- .../view/adminhtml/templates/preview/iframeswitcher.phtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml index 40658608305bf..f23c0222e8cf8 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml +++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml @@ -1,10 +1,11 @@
@@ -20,7 +21,7 @@ id="preview_iframe" class="preview_iframe" frameborder="0" - title="escapeHtmlAttr(__('Preview')) ?>" + title="escapeHtmlAttr(__('Preview')) ?>" width="100%" sandbox="allow-forms allow-pointer-lock allow-same-origin" >