diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js index 9f5bc0b7a8..c712e9bff2 100644 --- a/assets/js/src/newsletter_editor/components/save.js +++ b/assets/js/src/newsletter_editor/components/save.js @@ -47,10 +47,15 @@ define([ } else if(response.error !== undefined) { if(response.error.length === 0) { // TODO: Handle translations - MailPoet.Notice.error(""); + MailPoet.Notice.error( + "An unknown error occurred, please check your settings.", + { + scroll: true, + } + ); } else { $(response.error).each(function(i, error) { - MailPoet.Notice.error(error); + MailPoet.Notice.error(error, { scroll: true }); }); } } @@ -168,6 +173,7 @@ define([ App.getConfig().get('translations.templateNameMissing'), { positionAfter: that.$el, + scroll: true, } ); } else if (templateDescription === '') { @@ -175,6 +181,7 @@ define([ App.getConfig().get('translations.templateDescriptionMissing'), { positionAfter: that.$el, + scroll: true, } ); } else { @@ -188,6 +195,7 @@ define([ App.getConfig().get('translations.templateSaved'), { positionAfter: that.$el, + scroll: true, } ); }).fail(function() { @@ -196,6 +204,7 @@ define([ App.getConfig().get('translations.templateSaveFailed'), { positionAfter: that.$el, + scroll: true, } ); }); @@ -220,6 +229,7 @@ define([ App.getConfig().get('translations.templateNameMissing'), { positionAfter: that.$el, + scroll: true, } ); } else if (templateDescription === '') { @@ -227,6 +237,7 @@ define([ App.getConfig().get('translations.templateDescriptionMissing'), { positionAfter: that.$el, + scroll: true, } ); } else { diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index 759cdc21a2..4734cc3e18 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -251,12 +251,20 @@ define([ CommunicationComponent.previewNewsletter(data).done(function(response) { if(response.result !== undefined && response.result === true) { - MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent')); + MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true }); } else { if (_.isArray(response.errors)) { - MailPoet.Notice.error(response.errors.join("\n")); + response.errors.map(function(error) { + MailPoet.Notice.error(error, { scroll: true }); + }); } else { - MailPoet.Notice.error(App.getConfig().get('translations.newsletterPreviewFailedToSend')); + MailPoet.Notice.error( + App.getConfig().get('translations.newsletterPreviewFailedToSend'), + { + scroll: true, + static: true, + } + ); } } MailPoet.Modal.loading(false);