public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated mjml2html method

Browse source
This commit is contained in:
Dominique Da Silva 2019-11-04 01:46:43 +00:00
parent e2d4073b3e
commit dc72200fae
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/helpers.js
View file

@ -10,7 +10,7 @@ let fields = require('./models/fields');
let forms = require('./models/forms'); let forms = require('./models/forms');
let _ = require('./translate')._; let _ = require('./translate')._;
let objectHash = require('object-hash'); let objectHash = require('object-hash');
let mjml = require('mjml'); let mjml2html = require("mjml");
let mjmlTemplates = new Map(); let mjmlTemplates = new Map();
let hbs = require('hbs'); let hbs = require('hbs');
@ -249,7 +249,7 @@ function getMjmlTemplate(template, callback) {
let done = source => { let done = source => {
let compiled; let compiled;
try { try {
compiled = mjml.mjml2html(source); compiled = mjml2html(source);
} catch (err) { } catch (err) {
return callback(err); return callback(err);
} }

5
lib/mailer.js
View file

@ -14,7 +14,8 @@ let templates = new Map();
let htmlToText = require('html-to-text'); let htmlToText = require('html-to-text');
let aws = require('aws-sdk'); let aws = require('aws-sdk');
let objectHash = require('object-hash'); let objectHash = require('object-hash');
let mjml = require('mjml'); let mjml2html = require("mjml");
let _ = require('./translate')._; let _ = require('./translate')._;
let util = require('util'); let util = require('util');
@ -136,7 +137,7 @@ function getTemplate(template, callback) {
if (isMjml) { if (isMjml) {
let compiled; let compiled;
try { try {
compiled = mjml.mjml2html(source); compiled = mjml2html(source);
} catch (err) { } catch (err) {
return callback(err); return callback(err);
} }

8
lib/models/forms.js
View file

@ -4,7 +4,7 @@ let db = require('../db');
let fs = require('fs'); let fs = require('fs');
let path = require('path'); let path = require('path');
let tools = require('../tools'); let tools = require('../tools');
let mjml = require('mjml'); let mjml2html = require("mjml");
let _ = require('../translate')._; let _ = require('../translate')._;
let allowedKeys = [ let allowedKeys = [
@ -368,14 +368,14 @@ function filterKeysAndValues(keysIn, valuesIn, method = 'include', prefixes = []
function testForMjmlErrors(keys, values) { function testForMjmlErrors(keys, values) {
let errors = []; let errors = [];
let testLayout = '<mjml><mj-body><mj-container>{{{body}}}</mj-container></mj-body></mjml>'; let testLayout = '<mjml><mj-body>{{{body}}}</mj-body></mjml>';
let hasMjmlError = (template, layout = testLayout) => { let hasMjmlError = (template, layout = testLayout) => {
let source = layout.replace(/\{\{\{body\}\}\}/g, template); let source = layout.replace(/\{\{\{body\}\}\}/g, template);
let compiled; let compiled;
try { try {
compiled = mjml.mjml2html(source); compiled = mjml2html(source);
} catch (err) { } catch (err) {
return err; return err;
} }
@ -388,7 +388,7 @@ function testForMjmlErrors(keys, values) {
}; };
keys.forEach((key, index) => { keys.forEach((key, index) => {
if (key.startsWith('mail_') || key.startsWith('web_')) { if ((key.startsWith('mail_') || key.startsWith('web_')) && !key.endsWith('_text')) {
let template = values[index]; let template = values[index];
let err = hasMjmlError(template); let err = hasMjmlError(template);