[style] Tighten syntax in html-pdf-cli-generator.coffee|js.

This commit is contained in:
hacksalot 2018-01-30 12:40:17 -05:00
parent c913de4bf7
commit a9e35203c2
No known key found for this signature in database
GPG Key ID: 2F343EC247CA4B06
2 changed files with 11 additions and 14 deletions

View File

@ -87,18 +87,18 @@ Definition of the HtmlPdfCLIGenerator class.
TODO: Local web server to ease wkhtmltopdf rendering
*/
wkhtmltopdf: function(markup, fOut, opts, on_error) {
var tempFile, wkhtmltopdf_args, wkhtmltopdf_options;
var tempFile, wkargs, wkopts;
tempFile = fOut.replace(/\.pdf$/i, '.pdf.html');
FS.writeFileSync(tempFile, markup, 'utf8');
wkhtmltopdf_options = _.extend({
'margin-bottom': '10mm',
'margin-top': '10mm'
wkopts = _.extend({
'margin-top': '10mm',
'margin-bottom': '10mm'
}, opts.wkhtmltopdf);
wkhtmltopdf_options = _.flatten(_.map(wkhtmltopdf_options, function(v, k) {
wkopts = _.flatten(_.map(wkopts, function(v, k) {
return ['--' + k, v];
}));
wkhtmltopdf_args = wkhtmltopdf_options.concat([tempFile, fOut]);
SPAWN('wkhtmltopdf', wkhtmltopdf_args, false, on_error, this);
wkargs = wkopts.concat([tempFile, fOut]);
SPAWN('wkhtmltopdf', wkargs, false, on_error, this);
},
/**

View File

@ -70,14 +70,11 @@ engines =
FS.writeFileSync tempFile, markup, 'utf8'
# Prepare wkhtmltopdf arguments.
wkhtmltopdf_options = _.extend(
{'margin-bottom': '10mm', 'margin-top': '10mm'}, opts.wkhtmltopdf)
wkhtmltopdf_options = _.flatten(_.map(wkhtmltopdf_options, (v, k)->
return ['--' + k, v]
))
wkhtmltopdf_args = wkhtmltopdf_options.concat [ tempFile, fOut ]
wkopts = _.extend 'margin-top': '10mm', 'margin-bottom': '10mm', opts.wkhtmltopdf
wkopts = _.flatten _.map wkopts, (v, k) -> ['--' + k, v]
wkargs = wkopts.concat [ tempFile, fOut ]
SPAWN 'wkhtmltopdf', wkhtmltopdf_args , false, on_error, @
SPAWN 'wkhtmltopdf', wkargs , false, on_error, @
return