From 327ac869ced6321037516216831c8dcbe254ff9a Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 22 Feb 2016 10:37:20 +0100 Subject: [PATCH 1/2] added support for embedded images in svg via "href" and "xlink:href" --- src/octoprint/plugins/svgtogcode/static/js/working_area.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 108b3e4e..035a6081 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -758,7 +758,12 @@ $(function(){ self._embedAllImages = function(svg, callback){ var allImages = svg.selectAll('image'); - var linkedImages = allImages.items.filter(function(i){ return !i.attr('href').startsWith('data:') }); + var linkedImages = allImages.items.filter(function(i){ + if(i.attr('xlink:href') != null) { + return !i.attr('xlink:href').startsWith('data:'); + } else if(i.attr('href') != null) { + return !i.attr('href').startsWith('data:'); + } if(linkedImages.length > 0){ var callbackCounter = linkedImages.length; for (var i = 0; i < linkedImages.length; i++) { From e54364a45cb6139ceec2ae819b63d8b093925640 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 22 Feb 2016 10:54:29 +0100 Subject: [PATCH 2/2] parenthesis bug fixed --- src/octoprint/plugins/svgtogcode/static/js/working_area.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 035a6081..4b35b252 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -763,7 +763,7 @@ $(function(){ return !i.attr('xlink:href').startsWith('data:'); } else if(i.attr('href') != null) { return !i.attr('href').startsWith('data:'); - } + }}); if(linkedImages.length > 0){ var callbackCounter = linkedImages.length; for (var i = 0; i < linkedImages.length; i++) {