Skip to content

Handle null values (along with undefined) in jspdf.plugin.svgToPdf.js #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brettz9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle null values (along with undefined) in jspdf.plugin.svgToPdf.js #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions jspdf.plugin.svgToPdf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var svgElementToPdf = function(element, pdf, options) {
$(element).children().each(function(i, node) {
var n = $(node);
if (n.is("g")) {
if (n.attr('transform') !== undefined) {
if (n.attr('transform') != null) {
var matrix = n.attr('transform').replace(/,/g, ' ').replace('matrix(', '').replace(')', ' cm');
pdf.internal.write('q');
pdf.internal.write(matrix);
Expand All @@ -62,7 +62,7 @@ var svgElementToPdf = function(element, pdf, options) {
if (n.is('g,line,rect,ellipse,circle,text,path')) {

var fillColor = n.attr('fill');
if (typeof(fillColor) != 'undefined') {
if (fillColor != null) {
var fillRGB = new RGBColor(fillColor);

if (fillRGB.ok) {
Expand All @@ -81,7 +81,7 @@ var svgElementToPdf = function(element, pdf, options) {
}

var strokeColor = n.attr('stroke');
if (typeof(strokeColor) != 'undefined' && strokeColor !== 'none') {
if (strokeColor != null && strokeColor !== 'none') {

var strokeRGB = new RGBColor(strokeColor);
if (strokeRGB.ok) {
Expand All @@ -108,7 +108,7 @@ var svgElementToPdf = function(element, pdf, options) {
k * parseInt(n.attr('y2')));

// $.each(node.attributes, function(i, a) {
// if(typeof(a) != 'undefined' && pdfSvgAttr.line.indexOf(a.name.toLowerCase()) == -1) {
// if(a != null && pdfSvgAttr.line.indexOf(a.name.toLowerCase()) == -1) {
// node.removeAttribute(a.name);
// }
// });
Expand All @@ -122,7 +122,7 @@ var svgElementToPdf = function(element, pdf, options) {
k * parseInt(n.attr('height')),
colorMode);
// $.each(node.attributes, function(i, a) {
// if(typeof(a) != 'undefined' && pdfSvgAttr.rect.indexOf(a.name.toLowerCase()) == -1) {
// if(a != null && pdfSvgAttr.rect.indexOf(a.name.toLowerCase()) == -1) {
// node.removeAttribute(a.name);
// }
// });
Expand All @@ -135,7 +135,7 @@ var svgElementToPdf = function(element, pdf, options) {
k * parseInt(n.attr('ry')),
colorMode);
// $.each(node.attributes, function(i, a) {
// if(typeof(a) != 'undefined' && pdfSvgAttr.ellipse.indexOf(a.name.toLowerCase()) == -1) {
// if(a != null && pdfSvgAttr.ellipse.indexOf(a.name.toLowerCase()) == -1) {
// node.removeAttribute(a.name);
// }
// });
Expand All @@ -147,7 +147,7 @@ var svgElementToPdf = function(element, pdf, options) {
k * parseInt(n.attr('r')),
colorMode);
// $.each(node.attributes, function(i, a) {
// if(typeof(a) != 'undefined' && pdfSvgAttr.circle.indexOf(a.name.toLowerCase()) == -1) {
// if(a != null && pdfSvgAttr.circle.indexOf(a.name.toLowerCase()) == -1) {
// node.removeAttribute(a.name);
// }
// });
Expand Down Expand Up @@ -245,7 +245,7 @@ var svgElementToPdf = function(element, pdf, options) {
k * y,
text_value);
// $.each(node.attributes, function(i, a) {
// if(typeof(a) != 'undefined' && pdfSvgAttr.text.indexOf(a.name.toLowerCase()) == -1) {
// if(a != null && pdfSvgAttr.text.indexOf(a.name.toLowerCase()) == -1) {
// node.removeAttribute(a.name);
// }
// });
Expand Down