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

Change unsubscribe verifier to check for "Unsubscribe" shortcode

Browse Source 
presence
This commit is contained in:
Tautvidas Sipavičius
2016-05-31 16:29:10 +03:00
parent 2b6e87c3a7
commit e6724b1d4a
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/js/src/newsletter_editor/blocks/footer.js
View File

@@ -62,6 +62,7 @@ define([
invalid_elements: "script", invalid_elements: "script",
block_formats: 'Paragraph=p', block_formats: 'Paragraph=p',
relative_urls: false, relative_urls: false,
remove_script_host: false,
plugins: "link textcolor colorpicker mailpoet_custom_fields", plugins: "link textcolor colorpicker mailpoet_custom_fields",

1
assets/js/src/newsletter_editor/blocks/header.js
View File

@@ -62,6 +62,7 @@ define([
invalid_elements: "script", invalid_elements: "script",
block_formats: 'Paragraph=p', block_formats: 'Paragraph=p',
relative_urls: false, relative_urls: false,
remove_script_host: false,
plugins: "link textcolor colorpicker mailpoet_custom_fields", plugins: "link textcolor colorpicker mailpoet_custom_fields",

1
assets/js/src/newsletter_editor/blocks/text.js
View File

@@ -60,6 +60,7 @@ define([
invalid_elements: "script", invalid_elements: "script",
block_formats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p', block_formats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p',
relative_urls: false, relative_urls: false,
remove_script_host: false,
plugins: "link code textcolor colorpicker mailpoet_custom_fields", plugins: "link code textcolor colorpicker mailpoet_custom_fields",

4
assets/js/src/newsletter_editor/components/save.js
View File

@@ -283,8 +283,10 @@ define([
return; return;
} }
var contents = JSON.stringify(jsonObject);
if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') && if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
JSON.stringify(jsonObject).indexOf("[link:subscription_unsubscribe_url]") < 0) { contents.indexOf("[link:subscription_unsubscribe_url]") < 0 &&
contents.indexOf("[link:subscription_unsubscribe]") < 0) {
this.showValidationError(MailPoet.I18n.t('unsubscribeLinkMissing')); this.showValidationError(MailPoet.I18n.t('unsubscribeLinkMissing'));
return; return;
} }