Skip to content

Commit f157ce0

Browse files
committed
Fix CSP compliance of message timeout
1 parent d2d7b16 commit f157ce0

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

view/frontend/templates/component/messages.phtml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ use Loki\CssUtils\Util\CssClass;
99
/** @var Escaper $escaper */
1010
/** @var CssClass $css */
1111
/** @var ViewModelFactory $viewModelFactory */
12-
13-
$timeout = (int)$block->getTimeout();// @todo Right source for this?
14-
if (!$timeout > 0) {
15-
$timeout = 10000;
16-
}
1712
?>
1813
<div
1914
class="<?= /* @noEscape */ $css('container mx-auto py-3') ?>"
@@ -22,7 +17,7 @@ if (!$timeout > 0) {
2217
<div
2318
:data-message-text="message.text"
2419
@dblclick="removeMessage"
25-
x-autoremove="<?= $timeout ?>"
20+
x-autoremove="timeout"
2621
class="<?= /* @noEscape */ $css('message', 'message') ?>"
2722
:class="message.type">
2823
<div

view/frontend/templates/script/component/message-component.phtml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ declare(strict_types=1);
44
use Magento\Framework\View\Element\Template;
55

66
/** @var Template $block */
7+
8+
$timeout = (int)$block->getTimeout();// @todo Right source for this?
9+
if (!$timeout > 0) {
10+
$timeout = 10000;
11+
}
712
?>
813
<script>
914
document.addEventListener('alpine:init', () => {
1015
Alpine.data('LokiMessagesComponent', () => ({
1116
messages: [],
17+
timeout: <?= (int)$timeout ?>,
1218
init() {
1319
Alpine.effect(() => {
1420
this.messages = Alpine.store('LokiMessageStore').getMessages();
@@ -20,7 +26,7 @@ use Magento\Framework\View\Element\Template;
2026
removeMessage() {
2127
const messageText = this.$el.getAttribute('data-message-text');
2228
Alpine.store('LokiMessageStore').removeMessage(messageText);
23-
}
29+
},
2430
}));
2531
});
2632
</script>

0 commit comments

Comments
 (0)