Fix updating JS notice

[MAILPOET-2265]
This commit is contained in:
Ján Mikláš
2019-08-15 10:23:44 +02:00
committed by M. Shull
parent 79d9deb6c4
commit 0ae4953403

View File

@@ -91,26 +91,23 @@ MailPoet.Notice = {
}); });
}.bind(this.element)); }.bind(this.element));
// listen to message event
jQuery(this.element).on('setMessage', function (e, message) { // eslint-disable-line func-names
MailPoet.Notice.setMessage(message);
});
return this; return this;
}, },
updateNotice: function updateNotice() { updateNotice: function updateNotice() {
// update notice's message // update notice's message
jQuery('[data-id="' + this.options.id + '"').first().trigger( this.setMessage(
'setMessage', this.options.message this.options.message,
jQuery('[data-id="' + this.options.id + '"').first()
); );
}, },
setMessage: function setMessage(message) { setMessage: function setMessage(message, element) {
var formattedMessage = this.formatMessage(message); var formattedMessage = this.formatMessage(message);
var el = element || this.element;
// let's sugar coat the message with a fancy <p> // let's sugar coat the message with a fancy <p>
formattedMessage = '<p>' + formattedMessage + '</p>'; formattedMessage = '<p>' + formattedMessage + '</p>';
// set message // set message
return this.element.html(formattedMessage); return el.html(formattedMessage);
}, },
formatMessage: function formatMessage(message) { formatMessage: function formatMessage(message) {
if (Array.isArray(message)) { if (Array.isArray(message)) {
@@ -129,8 +126,8 @@ MailPoet.Notice = {
this.updateNotice(); this.updateNotice();
} else { } else {
this.createNotice(); this.createNotice();
this.showNotice();
} }
this.showNotice();
}, },
showNotice: function showNotice() { showNotice: function showNotice() {
// set message // set message