From 732379b0a39c5a44f52fc2ab7c616f10cbe5a735 Mon Sep 17 00:00:00 2001 From: grimlink Date: Fri, 19 Sep 2025 12:30:08 +0200 Subject: [PATCH 1/6] DEL: inline if This handled by the xml code, so this is redundant --- view/base/templates/view-transitions.phtml | 3 --- 1 file changed, 3 deletions(-) diff --git a/view/base/templates/view-transitions.phtml b/view/base/templates/view-transitions.phtml index cb53f4e..734d3d3 100644 --- a/view/base/templates/view-transitions.phtml +++ b/view/base/templates/view-transitions.phtml @@ -11,9 +11,6 @@ use MageOS\ThemeOptimization\ViewModel\ViewTransitions; /** @var ViewTransitions $viewModel */ $viewModel = $block->getViewModel(); -if (!$viewModel->isEnabled()) { - return; -} $style = << Date: Fri, 19 Sep 2025 12:30:19 +0200 Subject: [PATCH 2/6] FIX: order --- view/base/templates/view-transitions.phtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/base/templates/view-transitions.phtml b/view/base/templates/view-transitions.phtml index 734d3d3..638c406 100644 --- a/view/base/templates/view-transitions.phtml +++ b/view/base/templates/view-transitions.phtml @@ -1,14 +1,14 @@ -getViewModel(); From 154db804d1fd028ece5bcdb116772bde8e916220 Mon Sep 17 00:00:00 2001 From: grimlink Date: Fri, 19 Sep 2025 12:31:12 +0200 Subject: [PATCH 3/6] ADD: admin option --- etc/adminhtml/system.xml | 5 +++++ etc/config.xml | 1 + view/adminhtml/layout/default.xml | 7 ++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index d0406eb..5b8088a 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -122,6 +122,11 @@ Magento\Config\Model\Config\Source\Yesno Enable view transitions when loading pages on the same domain. + + + Magento\Config\Model\Config\Source\Yesno + Don't enable this when using the Mage-OS Admin Theme or any other Admin theme that supports View Transitions + Magento\Config\Model\Config\Source\Yesno diff --git a/etc/config.xml b/etc/config.xml index 66e926a..5e341d8 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -31,6 +31,7 @@ productalert 1 + 0 0 diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml index d405936..7f49306 100644 --- a/view/adminhtml/layout/default.xml +++ b/view/adminhtml/layout/default.xml @@ -2,9 +2,10 @@ - \MageOS\ThemeOptimization\ViewModel\ViewTransitions From 33af01655b75510ae209f0790e23175db8d63a96 Mon Sep 17 00:00:00 2001 From: Sean van Zuidam Date: Fri, 19 Sep 2025 19:53:45 +0200 Subject: [PATCH 4/6] IMP: etc/adminhtml/system.xml with feedback Co-authored-by: Ryan Hoerr --- etc/adminhtml/system.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 5b8088a..0e1bb40 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -122,7 +122,7 @@ Magento\Config\Model\Config\Source\Yesno Enable view transitions when loading pages on the same domain. - + Magento\Config\Model\Config\Source\Yesno Don't enable this when using the Mage-OS Admin Theme or any other Admin theme that supports View Transitions From f25ecb307f4709308cf4c542d033c2a102f3f9c0 Mon Sep 17 00:00:00 2001 From: Sean van Zuidam Date: Fri, 19 Sep 2025 19:55:02 +0200 Subject: [PATCH 5/6] IMP: make admin config enabled Co-authored-by: Ryan Hoerr --- etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/config.xml b/etc/config.xml index 5e341d8..e209e9f 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -31,7 +31,7 @@ productalert 1 - 0 + 1 0 From 70d857b2545149f45b6bfb3949f07f7ea0d747e5 Mon Sep 17 00:00:00 2001 From: Sean van Zuidam Date: Fri, 19 Sep 2025 19:57:53 +0200 Subject: [PATCH 6/6] IMP: tooltip text Co-authored-by: Ryan Hoerr --- etc/adminhtml/system.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 0e1bb40..b173c8c 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -125,7 +125,7 @@ Magento\Config\Model\Config\Source\Yesno - Don't enable this when using the Mage-OS Admin Theme or any other Admin theme that supports View Transitions + Disable if you don't want the view transitions, or when using the Mage-OS Admin Theme or any other Admin theme that has View Transitions built in