ParserStorage: handle text element

ac07621c · Romain Courteaud · d01cebe1 · ac07621c · ac07621c
Commit ac07621c authored Oct 17, 2017 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

src/jio.storage/parserstorage.js src/jio.storage/parserstorage.js +8 -5

test/jio.storage/parserstorage.tests.js test/jio.storage/parserstorage.tests.js +4 -0

No files found.
--- a/src/jio.storage/parserstorage.js
+++ b/src/jio.storage/parserstorage.js
 /*jslint nomen: true*/
-/*global jIO, DOMParser */
-(function (jIO, DOMParser) {
+/*global jIO, DOMParser, Node */
+(function (jIO, DOMParser, Node) {
  "use strict";

  /////////////////////////////////////////////////////////////
@@ -19,7 +19,9 @@

    for (i = channel_element.childNodes.length - 1; i >= 0; i -= 1) {
      tag_element = channel_element.childNodes[i];
-      result[tag_element.tagName] = tag_element.textContent;
+      if (tag_element.nodeType === Node.ELEMENT_NODE) {
+        result[tag_element.tagName] = tag_element.textContent;
+      }
    }
    return result;
  };
@@ -94,7 +96,8 @@

    for (i = element.childNodes.length - 1; i >= 0; i -= 1) {
      tag_element = element.childNodes[i];
-      if (tag_element.tagName !== 'item') {
+      if ((tag_element.nodeType === Node.ELEMENT_NODE) &&
+          (tag_element.tagName !== 'item')) {
        result[tag_element.tagName] = tag_element.textContent;

        for (j = tag_element.attributes.length - 1; j >= 0; j -= 1) {
@@ -200,4 +203,4 @@

  jIO.addStorage('parser', ParserStorage);

-}(jIO, DOMParser));
\ No newline at end of file
+}(jIO, DOMParser, Node));
\ No newline at end of file
--- a/test/jio.storage/parserstorage.tests.js
+++ b/test/jio.storage/parserstorage.tests.js
@@ -24,6 +24,8 @@
    var txt = '<?xml version="1.0" encoding="UTF-8" ?>' +
      '<rss version="2.0">' +
      '<channel>' +
+      // Add a text element to ensure xml parser handle it
+      ' ' +
      '<title>RSS Example</title>' +
      '<description>This is an example of an RSS feed</description>' +
      '<link>http://www.domain.com/link.htm</link>' +
@@ -64,6 +66,8 @@
      '<opml version="1.0">' +
      '<head>' +
      '<title>feedOnFeeds.xml</title>' +
+      // Add a text element to ensure xml parser handle it
+      ' ' +
      '<dateCreated>Thu, 12 Sep 2003 23:35:52 GMT</dateCreated>' +
      '<dateModified>Fri, 12 Sep 2003 23:45:37 GMT</dateModified>' +
      '<ownerName>SomeUser</ownerName>' +