Skip to content

Commit a112a1f

Browse files
committed
Merge remote-tracking branch 'mpipub/MAGETWO-54866' into MPI-PR
2 parents d323ecb + 9515999 commit a112a1f

File tree

1 file changed

+13
-1
lines changed
  • app/code/Magento/Theme/view/frontend/web/js/view

1 file changed

+13
-1
lines changed

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,23 @@ define([
1515
cookieMessages: [],
1616
messages: []
1717
},
18+
19+
/**
20+
* Extends Component object by storage observable messages.
21+
*/
1822
initialize: function () {
1923
this._super();
2024

2125
this.cookieMessages = $.cookieStorage.get('mage-messages');
22-
this.messages = customerData.get('messages').extend({disposableCustomerData: 'messages'});
26+
this.messages = customerData.get('messages').extend({
27+
disposableCustomerData: 'messages'
28+
});
29+
30+
// Force to clean obsolete messages
31+
if (!_.isEmpty(this.messages().messages)) {
32+
customerData.set('messages', {});
33+
}
34+
2335
$.cookieStorage.setConf({path: '/', expires: -1}).set('mage-messages', null);
2436
}
2537
});

0 commit comments

Comments
 (0)