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

Use only one preview link in preview modal

Browse Source 
[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-11 09:51:35 +01:00
committed by Jack Kitterhing
parent 369675626c
commit b22198f599
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,6 @@ Module.SidebarPreviewView = Marionette.View.extend({
this.previewView = new Module.NewsletterPreviewView({ this.previewView = new Module.NewsletterPreviewView({
previewType: window.localStorage.getItem(App.getConfig().get('newsletterPreview.previewTypeLocalStorageKey')), previewType: window.localStorage.getItem(App.getConfig().get('newsletterPreview.previewTypeLocalStorageKey')),
previewUrl: response.meta.preview_url, previewUrl: response.meta.preview_url,
publicPreviewUrl: response.meta.public_preview_url,
}); });
this.previewView.render(); this.previewView.render();
@ -402,7 +401,6 @@ Module.NewsletterPreviewView = Marionette.View.extend({
initialize: function (options) { initialize: function (options) {
this.previewType = options.previewType; this.previewType = options.previewType;
this.previewUrl = options.previewUrl; this.previewUrl = options.previewUrl;
this.publicPreviewUrl = options.publicPreviewUrl;
this.width = '100%'; this.width = '100%';
this.height = '100%'; this.height = '100%';
// this.width = App.getConfig().get('newsletterPreview.width'); // this.width = App.getConfig().get('newsletterPreview.width');
@ -412,7 +410,6 @@ Module.NewsletterPreviewView = Marionette.View.extend({
return { return {
previewType: this.previewType, previewType: this.previewType,
previewUrl: this.previewUrl, previewUrl: this.previewUrl,
publicPreviewUrl: this.publicPreviewUrl,
width: this.width, width: this.width,
height: this.height, height: this.height,
}; };

10
lib/API/JSON/v1/Newsletters.php
View File

@ -433,21 +433,15 @@ class Newsletters extends APIEndpoint {
$newsletter->body = $data['body']; $newsletter->body = $data['body'];
$newsletter->body = $this->emoji->encodeForUTF8Column(MP_NEWSLETTERS_TABLE, 'body', $newsletter->body); $newsletter->body = $this->emoji->encodeForUTF8Column(MP_NEWSLETTERS_TABLE, 'body', $newsletter->body);
$newsletter->save(); $newsletter->save();
$subscriber = Subscriber::getCurrentWPUser(); $previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber);
$publicPreviewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
// strip protocol to avoid mix content error // strip protocol to avoid mix content error
$previewUrl = preg_replace('{^https?:}i', '', $previewUrl); $previewUrl = preg_replace('{^https?:}i', '', $previewUrl);
$publicPreviewUrl = preg_replace('{^https?:}i', '', $publicPreviewUrl);
$newsletter = Newsletter::findOne($newsletter->id); $newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse(); if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse( return $this->successResponse(
$newsletter->asArray(), $newsletter->asArray(),
[ ['preview_url' => $previewUrl]
'preview_url' => $previewUrl,
'public_preview_url' => $publicPreviewUrl,
]
); );
} else { } else {
return $this->errorResponse([ return $this->errorResponse([

2
views/newsletter/templates/components/newsletterPreview.hbs
View File

@ -1,5 +1,5 @@
<div class="mailpoet_browser_preview_link"> <div class="mailpoet_browser_preview_link">
<a href="{{ publicPreviewUrl }}" target="_blank" rel="noopener noreferrer"><%= _x('Open in new tab', 'Open email preview in new tab') %></a> <a href="{{ previewUrl }}" target="_blank" rel="noopener noreferrer"><%= _x('Open in new tab', 'Open email preview in new tab') %></a>
</div> </div>
<div class="mailpoet_browser_preview_toggle"> <div class="mailpoet_browser_preview_toggle">
<label> <label>