caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked wkhtmltopdf parameters

Browse Source
This commit is contained in:
benweet 2014-08-14 23:23:39 +01:00
parent 149d3ec89d
commit 9e2f8b6231
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/pdf.js
View File

@ -46,7 +46,7 @@ module.exports = function(req, res, next) {
// wkhtmltopdf can't access /dev/stdout on Amazon EC2 for some reason // wkhtmltopdf can't access /dev/stdout on Amazon EC2 for some reason
var filePath = '/tmp/' + Date.now() + '.pdf'; var filePath = '/tmp/' + Date.now() + '.pdf';
var wkhtmltopdf = spawn('wkhtmltopdf', params.concat('--javascript-delay', '6000', '-', filePath), { var wkhtmltopdf = spawn('wkhtmltopdf', params.concat('--window-status', 'done', '-', filePath), {
stdio: [ stdio: [
'pipe', 'pipe',
'ignore', 'ignore',

9
public/res/publisher.js
View File

@ -355,11 +355,14 @@ define([
return task.chain(); return task.chain();
} }
monetize.getTokenImmediate(function(err, result) { monetize.getTokenImmediate(function(err, result) {
token = result || ''; token = result;
task.chain(); task.chain();
}); });
}); });
task.onRun(function() { task.onRun(function() {
if(!token) {
return task.chain();
}
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', constants.HTMLTOPDF_URL + '?token=' + encodeURIComponent(token) + '&options=' + encodeURIComponent(settings.pdfOptions), true); xhr.open('POST', constants.HTMLTOPDF_URL + '?token=' + encodeURIComponent(token) + '&options=' + encodeURIComponent(settings.pdfOptions), true);
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
@ -378,9 +381,7 @@ define([
xhr.send(content); xhr.send(content);
}); });
task.onSuccess(function() { task.onSuccess(function() {
if(pdf !== undefined) { pdf && utils.saveAs(pdf, fileMgr.currentFile.title + ".pdf");
utils.saveAs(pdf, fileMgr.currentFile.title + ".pdf");
}
}); });
task.enqueue(); task.enqueue();
}); });