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

Working on images in Edge

Browse Source
This commit is contained in:
Hillel Coren 2017-09-03 10:22:54 +03:00
parent fb01376a8a
commit 109d684437
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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

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

@ -119,7 +119,7 @@ function GetPdfMake(invoice, javascript, callback) {
// 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;
if (!invoice.features.remove_created_by && ! isEdge) { if (!invoice.features.remove_created_by) {
var footer = (typeof dd.footer === 'function') ? dd.footer() : dd.footer; var footer = (typeof dd.footer === 'function') ? dd.footer() : dd.footer;
if (footer) { if (footer) {
if (footer.hasOwnProperty('columns')) { if (footer.hasOwnProperty('columns')) {
@ -215,7 +215,7 @@ NINJA.decodeJavascript = function(invoice, javascript)
// search/replace variables // search/replace variables
var json = { var json = {
'accountName': account.name || ' ', 'accountName': account.name || ' ',
'accountLogo': ( ! isEdge && window.accountLogo) ? window.accountLogo : blankImage, 'accountLogo': window.accountLogo ? window.accountLogo : blankImage,
'accountDetails': NINJA.accountDetails(invoice), 'accountDetails': NINJA.accountDetails(invoice),
'accountAddress': NINJA.accountAddress(invoice), 'accountAddress': NINJA.accountAddress(invoice),
'invoiceDetails': NINJA.invoiceDetails(invoice), 'invoiceDetails': NINJA.invoiceDetails(invoice),
@ -224,7 +224,7 @@ NINJA.decodeJavascript = function(invoice, javascript)
'invoiceLineItemColumns': invoice.is_statement ? NINJA.statementColumns(invoice) : NINJA.invoiceColumns(invoice), 'invoiceLineItemColumns': invoice.is_statement ? NINJA.statementColumns(invoice) : NINJA.invoiceColumns(invoice),
'taskLineItems': NINJA.invoiceLines(invoice, true), 'taskLineItems': NINJA.invoiceLines(invoice, true),
//'taskLineItemColumns': NINJA.invoiceColumns(invoice), //'taskLineItemColumns': NINJA.invoiceColumns(invoice),
'invoiceDocuments' : isEdge ? [] : NINJA.invoiceDocuments(invoice), 'invoiceDocuments' : NINJA.invoiceDocuments(invoice),
'quantityWidth': NINJA.quantityWidth(invoice), 'quantityWidth': NINJA.quantityWidth(invoice),
'taxWidth': NINJA.taxWidth(invoice), 'taxWidth': NINJA.taxWidth(invoice),
'clientDetails': NINJA.clientDetails(invoice), 'clientDetails': NINJA.clientDetails(invoice),