SVG logo image can not show bug fixed.

ushelp · ushelp · commit 3a645bf77c28 · 2021-08-13T12:42:31.000+08:00
diff --git a/dist/easy.qrcode.min.js b/dist/easy.qrcode.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "easyqrcodejs",
-	"version": "4.4.3",
+	"version": "4.4.4",
 	"description": "Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)",
 	"main": "dist/easy.qrcode.min.js",
 	"scripts": {},
diff --git a/src/canvas2svg.js b/src/canvas2svg.js
@@ -1148,7 +1148,8 @@
             }
             svgImage.setAttribute("transform", translateDirective);
             svgImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
-                image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
+                // image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
+                image.nodeName === "CANVAS" ? image.toDataURL() : image.originalSrc);
             parent.appendChild(svgImage);
         }
     };
diff --git a/src/easy.qrcode.js b/src/easy.qrcode.js
@@ -3,7 +3,7 @@
  * 
  * Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)
  * 
- * Version 4.4.3
+ * Version 4.4.4
  * 
  * @author [ inthinkcolor@gmail.com ]
  * 
@@ -1513,6 +1513,7 @@
                 if (_htOption.crossOrigin != null) {
                     bgImg.crossOrigin = _htOption.crossOrigin;
                 }
+                bgImg.originalSrc = _htOption.backgroundImage;
                 bgImg.src = _htOption.backgroundImage;
                 // DoSomething
             } else {
@@ -1796,9 +1797,9 @@
                     if (_htOption.crossOrigin != null) {
                         img.crossOrigin = _htOption.crossOrigin;
                     }
+                    img.originalSrc = _htOption.logo;
                     img.src = _htOption.logo;
 
-
                 } else {
                     drawQuietZoneColor();
                     this._bIsPainted = true;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "easyqrcodejs",`
`3`		`- "version": "4.4.3",`
	`3`	`+ "version": "4.4.4",`
`4`	`4`	`"description": "Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)",`
`5`	`5`	`"main": "dist/easy.qrcode.min.js",`
`6`	`6`	`"scripts": {},`
Original file line number	Diff line number	Diff line change
`@@ -1148,7 +1148,8 @@`
`1148`	`1148`	`}`
`1149`	`1149`	`svgImage.setAttribute("transform", translateDirective);`
`1150`	`1150`	`svgImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",`
`1151`		`- image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));`
	`1151`	`+ // image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));`
	`1152`	`+ image.nodeName === "CANVAS" ? image.toDataURL() : image.originalSrc);`
`1152`	`1153`	`parent.appendChild(svgImage);`
`1153`	`1154`	`}`
`1154`	`1155`	`};`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)`
`5`	`5`	`*`
`6`		`- * Version 4.4.3`
	`6`	`+ * Version 4.4.4`
`7`	`7`	`*`
`8`	`8`	`* @author [ [email protected] ]`
`9`	`9`	`*`
`@@ -1513,6 +1513,7 @@`
`1513`	`1513`	`if (_htOption.crossOrigin != null) {`
`1514`	`1514`	`bgImg.crossOrigin = _htOption.crossOrigin;`
`1515`	`1515`	`}`
	`1516`	`+ bgImg.originalSrc = _htOption.backgroundImage;`
`1516`	`1517`	`bgImg.src = _htOption.backgroundImage;`
`1517`	`1518`	`// DoSomething`
`1518`	`1519`	`} else {`
`@@ -1796,9 +1797,9 @@`
`1796`	`1797`	`if (_htOption.crossOrigin != null) {`
`1797`	`1798`	`img.crossOrigin = _htOption.crossOrigin;`
`1798`	`1799`	`}`
	`1800`	`+ img.originalSrc = _htOption.logo;`
`1799`	`1801`	`img.src = _htOption.logo;`
`1800`	`1802`
`1801`		`-`
`1802`	`1803`	`} else {`
`1803`	`1804`	`drawQuietZoneColor();`
`1804`	`1805`	`this._bIsPainted = true;`