handle leading and trailing whitespace and comments in SVG files

iconfu · Aug 16, 2018 · 19f68ee · 19f68ee
1 parent 4af0508
commit 19f68ee
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 463 deletions.
diff --git a/dist/svg-inject.js b/dist/svg-inject.js
@@ -1,5 +1,5 @@
 /**
- * SVGInject - Version 1.0.0-rc.5
+ * SVGInject - Version 1.0.0-rc.7
  * A tiny, intuitive, robust, caching solution for injecting SVG files inline into the DOM.
  *
  * https://github.com/iconfu/svg-inject
@@ -69,7 +69,7 @@
           var status = req.status;
           if (status == 200) {
             // readyState is done, request status ok
-            callback(req.responseXML, req.responseText);
+            callback(req.responseXML, req.responseText.trim());
           } else if (status >= 400) {
             errorCallback();
           } else if (status == 0) {
@@ -169,7 +169,7 @@
 
   // inject svg by replacing the img element with the svg element in the DOM
   function inject(img, svg, svgString, absUrl, options) {
-    svg = svg || buildSvg(svgString, absUrl);       
+    svg = svg || buildSvg(svgString, absUrl);
 
     if (svg) {
       var parentNode = img.parentNode;
@@ -239,7 +239,8 @@
     } catch (e) {
       return NULL;
     }
-    var svg = DIV_ELEMENT.removeChild(DIV_ELEMENT.firstChild);
+    var svg = DIV_ELEMENT.firstElementChild;
+    DIV_ELEMENT.innerHTML = '';
 
     if (isSVGElem(svg)) {
       svg.setAttribute('data-inject-url', absUrl);

diff --git a/dist/svg-inject.min.js b/dist/svg-inject.min.js
diff --git a/examples/svg-inject.js b/examples/svg-inject.js
@@ -1,5 +1,5 @@
 /**
- * SVGInject - Version 1.0.0-rc.5
+ * SVGInject - Version 1.0.0-rc.7
  * A tiny, intuitive, robust, caching solution for injecting SVG files inline into the DOM.
  *
  * https://github.com/iconfu/svg-inject
@@ -69,7 +69,7 @@
           var status = req.status;
           if (status == 200) {
             // readyState is done, request status ok
-            callback(req.responseXML, req.responseText);
+            callback(req.responseXML, req.responseText.trim());
           } else if (status >= 400) {
             errorCallback();
           } else if (status == 0) {
@@ -169,7 +169,7 @@
 
   // inject svg by replacing the img element with the svg element in the DOM
   function inject(img, svg, svgString, absUrl, options) {
-    svg = svg || buildSvg(svgString, absUrl);       
+    svg = svg || buildSvg(svgString, absUrl);
 
     if (svg) {
       var parentNode = img.parentNode;
@@ -239,7 +239,8 @@
     } catch (e) {
       return NULL;
     }
-    var svg = DIV_ELEMENT.removeChild(DIV_ELEMENT.firstChild);
+    var svg = DIV_ELEMENT.firstElementChild;
+    DIV_ELEMENT.innerHTML = '';
 
     if (isSVGElem(svg)) {
       svg.setAttribute('data-inject-url', absUrl);

diff --git a/examples/svg-inject.min.js b/examples/svg-inject.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -9,7 +9,6 @@ gulp.task('default', function (cb) {
   pump([
     gulp.src('src/svg-inject.js'),
     gulp.dest('dist/'),
-    gulp.dest('test/js/'),
     gulp.dest('examples/'),
     uglify({
       output: {
@@ -19,6 +18,7 @@ gulp.task('default', function (cb) {
     }),
     rename({ extname: '.min.js' }),
     gulp.dest('examples/'),
+    gulp.dest('test/js/'),
     gulp.dest('dist/')
   ], cb);
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iconfu/svg-inject",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.7",
   "description": "simple bulletproof svg injector",
   "main": "dist/svg-inject.js",
   "repository": {

diff --git a/src/svg-inject.js b/src/svg-inject.js
@@ -1,5 +1,5 @@
 /**
- * SVGInject - Version 1.0.0-rc.6
+ * SVGInject - Version 1.0.0-rc.7
  * A tiny, intuitive, robust, caching solution for injecting SVG files inline into the DOM.
  *
  * https://github.com/iconfu/svg-inject
@@ -69,7 +69,7 @@
           var status = req.status;
           if (status == 200) {
             // readyState is done, request status ok
-            callback(req.responseXML, req.responseText);
+            callback(req.responseXML, req.responseText.trim());
           } else if (status >= 400) {
             errorCallback();
           } else if (status == 0) {
@@ -169,7 +169,7 @@
 
   // inject svg by replacing the img element with the svg element in the DOM
   function inject(img, svg, svgString, absUrl, options) {
-    svg = svg || buildSvg(svgString, absUrl);       
+    svg = svg || buildSvg(svgString, absUrl);
 
     if (svg) {
       var parentNode = img.parentNode;
@@ -239,7 +239,8 @@
     } catch (e) {
       return NULL;
     }
-    var svg = DIV_ELEMENT.removeChild(DIV_ELEMENT.firstChild);
+    var svg = DIV_ELEMENT.firstElementChild;
+    DIV_ELEMENT.innerHTML = '';
 
     if (isSVGElem(svg)) {
       svg.setAttribute('data-inject-url', absUrl);

diff --git a/test/imgs/test3.svg b/test/imgs/test3.svg