Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add option to scroll to notices

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2016-01-14 13:39:48 +02:00
parent 7954346a3f
commit 46c1b682fa
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
assets/js/src/newsletter_editor/components/save.js
View File

@@ -47,10 +47,15 @@ define([
} else if(response.error !== undefined) { } else if(response.error !== undefined) {
if(response.error.length === 0) { if(response.error.length === 0) {
// TODO: Handle translations // TODO: Handle translations
MailPoet.Notice.error("<?php _e('An unknown error occurred, please check your settings.'); ?>"); MailPoet.Notice.error(
"An unknown error occurred, please check your settings.",
{
scroll: true,
}
);
} else { } else {
$(response.error).each(function(i, error) { $(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'), App.getConfig().get('translations.templateNameMissing'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
} else if (templateDescription === '') { } else if (templateDescription === '') {
@@ -175,6 +181,7 @@ define([
App.getConfig().get('translations.templateDescriptionMissing'), App.getConfig().get('translations.templateDescriptionMissing'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
} else { } else {
@@ -188,6 +195,7 @@ define([
App.getConfig().get('translations.templateSaved'), App.getConfig().get('translations.templateSaved'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
}).fail(function() { }).fail(function() {
@@ -196,6 +204,7 @@ define([
App.getConfig().get('translations.templateSaveFailed'), App.getConfig().get('translations.templateSaveFailed'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
}); });
@@ -220,6 +229,7 @@ define([
App.getConfig().get('translations.templateNameMissing'), App.getConfig().get('translations.templateNameMissing'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
} else if (templateDescription === '') { } else if (templateDescription === '') {
@@ -227,6 +237,7 @@ define([
App.getConfig().get('translations.templateDescriptionMissing'), App.getConfig().get('translations.templateDescriptionMissing'),
{ {
positionAfter: that.$el, positionAfter: that.$el,
scroll: true,
} }
); );
} else { } else {

14
assets/js/src/newsletter_editor/components/sidebar.js
View File

@@ -251,12 +251,20 @@ define([
CommunicationComponent.previewNewsletter(data).done(function(response) { CommunicationComponent.previewNewsletter(data).done(function(response) {
if(response.result !== undefined && response.result === true) { 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 { } else {
if (_.isArray(response.errors)) { if (_.isArray(response.errors)) {
MailPoet.Notice.error(response.errors.join("\n")); response.errors.map(function(error) {
MailPoet.Notice.error(error, { scroll: true });
});
} else { } 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); MailPoet.Modal.loading(false);