check if src is undefined

jonathantneal · Jul 20, 2017 · 3850089 · 3850089
1 parent 377d272
commit 3850089
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/dist/svg4everybody.js b/dist/svg4everybody.js
@@ -52,10 +52,9 @@
             for (// get the cached <use> index
             var index = 0; index < uses.length; ) {
                 // get the current <use>
-                var use = uses[index], parent = use.parentNode, svg = getSVGAncestor(parent);
-                if (svg) {
-                    var src = use.getAttribute("xlink:href") || use.getAttribute("href");
-                    !src && opts.attributeName && (src = use.getAttribute(opts.attributeName));
+                var use = uses[index], parent = use.parentNode, svg = getSVGAncestor(parent), src = use.getAttribute("xlink:href") || use.getAttribute("href");
+                if (!src && opts.attributeName && (src = use.getAttribute(opts.attributeName)), 
+                svg && src) {
                     if (polyfill) {
                         if (!opts.validate || opts.validate(src, svg, use)) {
                             // remove the <use> element

diff --git a/dist/svg4everybody.legacy.js b/dist/svg4everybody.legacy.js
@@ -52,12 +52,11 @@
             for (// get the cached <use> index
             var index = 0; index < uses.length; ) {
                 // get the current <use>
-                var use = uses[index], parent = use.parentNode, svg = getSVGAncestor(parent);
-                if (svg) {
-                    var src = use.getAttribute("xlink:href") || use.getAttribute("href");
+                var use = uses[index], parent = use.parentNode, svg = getSVGAncestor(parent), src = use.getAttribute("xlink:href") || use.getAttribute("href");
+                if (!src && opts.attributeName && (src = use.getAttribute(opts.attributeName)), 
+                svg && src) {
                     // if running with legacy support
-                    if (!src && opts.attributeName && (src = use.getAttribute(opts.attributeName)), 
-                    nosvg) {
+                    if (nosvg) {
                         // create a new fallback image
                         var img = document.createElement("img");
                         // force display in older IE

diff --git a/dist/svg4everybody.legacy.min.js b/dist/svg4everybody.legacy.min.js
diff --git a/dist/svg4everybody.min.js b/dist/svg4everybody.min.js
diff --git a/lib/svg4everybody.js b/lib/svg4everybody.js
@@ -128,13 +128,13 @@ function svg4everybody(rawopts) {
 			// get the current <svg>
 			var parent = use.parentNode;
 			var svg = getSVGAncestor(parent);
+			var src = use.getAttribute('xlink:href') || use.getAttribute('href');
 
-			if (svg) {
-				var src = use.getAttribute('xlink:href') || use.getAttribute('href');
+			if (!src && opts.attributeName) {
+				src = use.getAttribute(opts.attributeName);
+			}
 
-				if (!src && opts.attributeName) {
-					src = use.getAttribute(opts.attributeName);
-				}
+			if (svg && src) {
 
 				// if running with legacy support
 				if (LEGACY_SUPPORT && nosvg) {