From 364facabd50b874ddeb2c738a58a1f55709d156d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Sun, 29 Jul 2018 13:45:34 +0200
Subject: [PATCH] Display after-save notice always on top (& scroll there)

The save component was displaying notice just below the save buttons. This seems
inconsistent with WP behaviour for the save button in the bottom. This makes the
notices always display on top & scroll there if necessary.

[MAILPOET-1448]
---
 .../src/newsletter_editor/components/save.js  | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js
index 1e9d7649e7..ec10ea0e5b 100644
--- a/assets/js/src/newsletter_editor/components/save.js
+++ b/assets/js/src/newsletter_editor/components/save.js
@@ -34,6 +34,7 @@ define([
   // Save editor contents to server
   Module.save = function () {
     var json = App.toJSON();
+    var editorTop = $('#mailpoet_editor_top');
 
     // Stringify to enable transmission of primitive non-string value types
     if (!_.isUndefined(json.body)) {
@@ -52,12 +53,19 @@ define([
           MailPoet.Notice.error(
             MailPoet.I18n.t('templateSaveFailed'),
             {
+              positionAfter: editorTop,
               scroll: true
             }
           );
         } else {
           $(response.error).each(function (i, error) {
-            MailPoet.Notice.error(error, { scroll: true });
+            MailPoet.Notice.error(
+              error,
+              {
+                positionAfter: editorTop,
+                scroll: true
+              }
+            );
           });
         }
       }
@@ -186,13 +194,13 @@ define([
     },
     saveAsTemplate: function () {
       var templateName = this.$('.mailpoet_save_as_template_name').val();
-      var that = this;
+      var editorTop = $('#mailpoet_editor_top');
 
       if (templateName === '') {
         MailPoet.Notice.error(
           MailPoet.I18n.t('templateNameMissing'),
           {
-            positionAfter: that.$el,
+            positionAfter: editorTop,
             scroll: true
           }
         );
@@ -203,7 +211,7 @@ define([
           MailPoet.Notice.success(
             MailPoet.I18n.t('templateSaved'),
             {
-              positionAfter: that.$el,
+              positionAfter: editorTop,
               scroll: true
             }
           );
@@ -214,7 +222,7 @@ define([
           MailPoet.Notice.error(
             MailPoet.I18n.t('templateSaveFailed'),
             {
-              positionAfter: that.$el,
+              positionAfter: editorTop,
               scroll: true
             }
           );
@@ -230,13 +238,13 @@ define([
     },
     exportTemplate: function () {
       var templateName = this.$('.mailpoet_export_template_name').val();
-      var that = this;
+      var editorTop = $('#mailpoet_editor_top');
 
       if (templateName === '') {
         MailPoet.Notice.error(
           MailPoet.I18n.t('templateNameMissing'),
           {
-            positionAfter: that.$el,
+            positionAfter: editorTop,
             scroll: true
           }
         );