From 9fb17d4a6ba88f3ace226d40533735e8feae5fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Tue, 16 Aug 2016 18:05:51 +0300 Subject: [PATCH] Fix "Preview in browser" notice to display a proper success message --- assets/js/src/newsletter_editor/components/sidebar.js | 9 +++++---- views/newsletter/editor.html | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index baca2cafc5..61db9b74e5 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -247,17 +247,18 @@ define([ action: 'showPreview', data: json, }).done(function(response){ - MailPoet.Modal.loading(false); - if (response.result === true) { window.open(response.data.url, '_blank') + MailPoet.Notice.success(MailPoet.I18n.t('previewShouldOpenInNewTab')); + } else { + MailPoet.Notice.error(response.errors); } - MailPoet.Notice.error(response.errors); }).fail(function(error) { - MailPoet.Modal.loading(false); MailPoet.Notice.error( MailPoet.I18n.t('newsletterPreviewFailed') ); + }).always(function() { + MailPoet.Modal.loading(false); }); }, sendPreview: function() { diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index dcae098ed1..ffe3355efd 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -329,6 +329,7 @@ 'templateSaveFailed': __('Template has not been saved, please try again'), 'categoriesAndTags': __('Categories & tags'), 'noPostsToDisplay': __('There is no content to display'), + 'previewShouldOpenInNewTab': __('Your preview should open in a new tab. Please ensure your browser is not blocking popups from this page.'), }) %> <% endblock %>