From 50c248dcb049e170fcd06b8031a87ba319a2152a Mon Sep 17 00:00:00 2001 From: Jonny Bradley Date: Sat, 16 Mar 2013 14:07:55 +0000 Subject: [PATCH] Fix in setSvgString() for images with no href (images in pattern#gridpattern don't seem to have them) git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2497 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svgcanvas.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 7a98c591..a33cdfb0 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -4722,18 +4722,20 @@ this.setSvgString = function(xmlString) { var image = this; preventClickDefault(image); var val = getHref(this); - if (val.indexOf('data:') === 0) { - // Check if an SVG-edit data URI - var m = val.match(/svgedit_url=(.*?);/); - if (m) { - var url = decodeURIComponent(m[1]); - $(new Image()).load(function() { - image.setAttributeNS(NS.XLINK, 'xlink:href', url); - }).attr('src', url); + if (val) { + if (val.indexOf('data:') === 0) { + // Check if an SVG-edit data URI + var m = val.match(/svgedit_url=(.*?);/); + if (m) { + var url = decodeURIComponent(m[1]); + $(new Image()).load(function () { + image.setAttributeNS(xlinkns, 'xlink:href', url); + }).attr('src', url); + } } + // Add to encodableImages if it loads + canvas.embedImage(val); } - // Add to encodableImages if it loads - canvas.embedImage(val); }); // Wrap child SVGs in group elements