Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for new lines in invoice JSON

Browse Source
This commit is contained in:
Hillel Coren 2017-06-14 11:01:18 +03:00
parent 13347e949c
commit e75282d585
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/pdf.pdfmake.js
View File

@ -98,9 +98,6 @@ function GetPdfMake(invoice, javascript, callback) {
return val; return val;
} }
// escape new lines
javascript = javascript.replace(/\n/g, "\\n").replace(/\r/g, "\\r");
// Add ninja logo to the footer // Add ninja logo to the footer
var dd = JSON.parse(javascript, jsonCallBack); var dd = JSON.parse(javascript, jsonCallBack);
var designId = invoice.invoice_design_id; var designId = invoice.invoice_design_id;
@ -323,6 +320,7 @@ NINJA.decodeJavascript = function(invoice, javascript)
var value = getDescendantProp(invoice, field) || ' '; var value = getDescendantProp(invoice, field) || ' ';
value = doubleDollarSign(value); value = doubleDollarSign(value);
value = value.replace(/\n/g, "\\n").replace(/\r/g, "\\r");
javascript = javascript.replace(match, '"'+value+'"'); javascript = javascript.replace(match, '"'+value+'"');
} }
} }