Skip to content

Commit 016bed9

Browse files
committed
#37308: made improvement backwards compatible with merchants that have overwritten messages.phtml template
1 parent 6043392 commit 016bed9

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

app/code/Magento/Theme/view/frontend/templates/messages.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
?>
77
<div data-bind="scope: 'messages'">
8-
<!-- ko if: cookieMessages() && cookieMessages().length > 0 -->
8+
<!-- ko if: cookieMessagesObservable() && cookieMessagesObservable().length > 0 -->
99
<div aria-atomic="true" role="alert" class="messages" data-bind="foreach: {
10-
data: cookieMessages(), as: 'message'
10+
data: cookieMessagesObservable(), as: 'message'
1111
}">
1212
<div data-bind="attr: {
1313
class: 'message-' + message.type + ' ' + message.type + ' message',

app/code/Magento/Theme/view/frontend/web/js/view/messages.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ define([
1919
return Component.extend({
2020
defaults: {
2121
cookieMessages: [],
22+
cookieMessagesObservable: [],
2223
messages: [],
2324
allowedTags: ['div', 'span', 'b', 'strong', 'i', 'em', 'u', 'a']
2425
},
@@ -29,11 +30,15 @@ define([
2930
initialize: function () {
3031
this._super().observe(
3132
[
32-
'cookieMessages'
33+
'cookieMessagesObservable'
3334
]
3435
);
3536

36-
this.cookieMessages(_.unique($.cookieStorage.get('mage-messages'), 'text'));
37+
// The "cookieMessages" variable is not used anymore. It exists for backward compatibility; to support
38+
// merchants who have overwritten "messages.phtml" which would still point to cookieMessages instead of the
39+
// observable variant (also see https://github.com/magento/magento2/pull/37309).
40+
this.cookieMessages = _.unique($.cookieStorage.get('mage-messages'), 'text');
41+
this.cookieMessagesObservable(this.cookieMessages);
3742

3843
this.messages = customerData.get('messages').extend({
3944
disposableCustomerData: 'messages'

0 commit comments

Comments
 (0)