Add default email for newsletter preview, disallow empty email

This commit is contained in:
Tautvidas Sipavičius
2016-03-03 12:59:49 +02:00
parent 9e84e8df93
commit b1bbf1b3bc
4 changed files with 18 additions and 3 deletions

View File

@@ -248,11 +248,23 @@ define([
// testing sending method // testing sending method
console.log('trying to send a preview'); console.log('trying to send a preview');
// get form data // get form data
var $emailField = this.$('#mailpoet_preview_to_email');
var data = { var data = {
subscriber: this.$('#mailpoet_preview_to_email').val(), subscriber: $emailField.val(),
id: App.getNewsletter().get('id'), id: App.getNewsletter().get('id'),
}; };
if (data.subscriber.length <= 0) {
MailPoet.Notice.error(
App.getConfig().get('translations.newsletterPreviewEmailMissing'),
{
positionAfter: $emailField,
scroll: true,
}
);
return false;
}
// send test email // send test email
MailPoet.Modal.loading(true); MailPoet.Modal.loading(true);

View File

@@ -380,6 +380,7 @@ class Menu {
$data = array( $data = array(
'customFields' => $custom_fields, 'customFields' => $custom_fields,
'settings' => Setting::getAll(),
); );
wp_enqueue_media(); wp_enqueue_media();
wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js')); wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js'));

View File

@@ -1242,6 +1242,8 @@
'<%= __('Select a shortcode') %>', '<%= __('Select a shortcode') %>',
unsubscribeLinkMissing: unsubscribeLinkMissing:
'<%= __('Please include an unsubscribe link to continue.') %>', '<%= __('Please include an unsubscribe link to continue.') %>',
newsletterPreviewEmailMissing:
'<%= __('Please enter an email where newsletter preview should be sent to.') %>',
newsletterPreviewSent: newsletterPreviewSent:
'<%= __('Newsletter preview email has been successfully sent!') %>', '<%= __('Newsletter preview email has been successfully sent!') %>',
newsletterPreviewFailedToSend: newsletterPreviewFailedToSend:
@@ -1264,7 +1266,7 @@
imageMissing: '<%= image_url( imageMissing: '<%= image_url(
"newsletter_editor/image-missing.svg" "newsletter_editor/image-missing.svg"
) %>', ) %>',
} },
}; };
var editor = null; var editor = null;

View File

@@ -4,7 +4,7 @@
<div class="mailpoet_form_field"> <div class="mailpoet_form_field">
<label> <label>
<%= __('Send preview to') %><br /> <%= __('Send preview to') %><br />
<input id="mailpoet_preview_to_email" class="mailpoet_input mailpoet_input_full" type="text" name="to_email" value="{{ from_email }}" /> <input id="mailpoet_preview_to_email" class="mailpoet_input mailpoet_input_full" type="text" name="to_email" value="<%= settings.sender.address %>" />
</label> </label>
</div> </div>