From 33b2a4923a49116c9f7791cafc42f0a5561fc346 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Fri, 28 Aug 2020 13:05:03 +0200 Subject: [PATCH] Remove preview from sidebar [MAILPOET-2981] --- .../newsletter_editor/components/sidebar.js | 19 --------------- .../mochaTestHelper.js | 1 - .../components/sidebar.spec.js | 11 --------- views/newsletter/editor.html | 7 ------ .../templates/components/sidebar/preview.hbs | 24 ------------------- 5 files changed, 62 deletions(-) delete mode 100644 views/newsletter/templates/components/sidebar/preview.hbs diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index ac6bdd3ec8..d3a59c434d 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -104,7 +104,6 @@ SidebarView = Marionette.View.extend({ availableStyles: App.getAvailableStyles(), isWoocommerceTransactional: this.model.isWoocommerceTransactional(), })); - this.showChildView('previewRegion', new Module.SidebarPreviewView()); }, updateHorizontalScroll: function () { // Fixes the sidebar so that on narrower screens the horizontal @@ -246,24 +245,6 @@ Module.SidebarStylesView = Marionette.View.extend({ }, }); -Module.SidebarPreviewView = Marionette.View.extend({ - getTemplate: function () { return window.templates.sidebarPreview; }, - templateContext: function () { - return { - mssKeyPendingApproval: window.mailpoet_mss_key_pending_approval, - }; - }, - events: { - - }, - onBeforeDestroy: function () { - if (this.previewView) { - this.previewView.destroy(); - this.previewView = null; - } - }, -}); - App.on('before:start', function (BeforeStartApp) { var Application = BeforeStartApp; Application.registerWidget = Module.registerWidget; diff --git a/tests/javascript_newsletter_editor/mochaTestHelper.js b/tests/javascript_newsletter_editor/mochaTestHelper.js index 6ab9917216..27c59f58ea 100644 --- a/tests/javascript_newsletter_editor/mochaTestHelper.js +++ b/tests/javascript_newsletter_editor/mochaTestHelper.js @@ -197,7 +197,6 @@ global.templates = { sidebarContent: Handlebars.compile(jQuery('#newsletter_editor_template_sidebar_content').html()), sidebarLayout: Handlebars.compile(jQuery('#newsletter_editor_template_sidebar_layout').html()), sidebarStyles: Handlebars.compile(jQuery('#newsletter_editor_template_sidebar_styles').html()), - sidebarPreview: Handlebars.compile(jQuery('#newsletter_editor_template_sidebar_preview').html()), genericBlockTools: Handlebars.compile(jQuery('#newsletter_editor_template_tools_generic').html()), diff --git a/tests/javascript_newsletter_editor/newsletter_editor/components/sidebar.spec.js b/tests/javascript_newsletter_editor/newsletter_editor/components/sidebar.spec.js index 3369b52d08..372de401be 100644 --- a/tests/javascript_newsletter_editor/newsletter_editor/components/sidebar.spec.js +++ b/tests/javascript_newsletter_editor/newsletter_editor/components/sidebar.spec.js @@ -180,15 +180,4 @@ describe('Sidebar', function () { }); }); }); - - describe('preview view', function () { - var view; - beforeEach(function () { - view = new (SidebarComponent.SidebarPreviewView)(); - }); - - it('renders', function () { - expect(view.render).to.not.throw(); - }); - }); }); diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index 79613b9a7a..7d856f5fec 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -265,10 +265,6 @@ 'newsletter_editor_template_sidebar_layout', 'newsletter/templates/components/sidebar/layout.hbs' ) %> - <%= partial( - 'newsletter_editor_template_sidebar_preview', - 'newsletter/templates/components/sidebar/preview.hbs' - ) %> <%= partial( 'newsletter_editor_template_sidebar_styles', 'newsletter/templates/components/sidebar/styles.hbs' @@ -449,9 +445,6 @@ sidebarStyles: Handlebars.compile( jQuery('#newsletter_editor_template_sidebar_styles').html() ), - sidebarPreview: Handlebars.compile( - jQuery('#newsletter_editor_template_sidebar_preview').html() - ), newsletterPreview: Handlebars.compile( jQuery('#newsletter_editor_template_newsletter_preview').html() ), diff --git a/views/newsletter/templates/components/sidebar/preview.hbs b/views/newsletter/templates/components/sidebar/preview.hbs deleted file mode 100644 index 42f9b16275..0000000000 --- a/views/newsletter/templates/components/sidebar/preview.hbs +++ /dev/null @@ -1,24 +0,0 @@ -

-

<%= __('Preview') %>

-
- -
-
- -
- -
- - -
-
- - {{#if mssKeyPendingApproval }} -
- <%= __('You’ll soon be able to send once our team reviews your account. In the meantime, you can send previews to [link]your authorized emails[/link].')|replaceLinkTags('https://account.mailpoet.com/authorization', {'target': '_blank', 'rel': 'noopener noreferrer'})|raw %> -
- {{/if}} -