Use native Firefox DOMParser.

Provide a better html parsing, to continue working on renderJS itself.

Use native Firefox DOMParser.
Provide a better html parsing, to continue working on renderJS itself.
72914726 · Romain Courteaud · 6d43204c · 72914726 · 72914726
Commit 72914726 authored Jul 09, 2013 by Romain Courteaud 🐸
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 5 deletions

renderjs.js renderjs.js +9 -5

test/renderjs_test2.js test/renderjs_test2.js +14 -0

No files found.
--- a/renderjs.js
+++ b/renderjs.js
 /*! RenderJs v0.2  */
-/*global $, jQuery, localStorage, jIO, window, document */
+/*global $, jQuery, localStorage, jIO, window, document, DOMParser */
 /*jslint evil: true, indent: 2, maxerr: 3, maxlen: 79 */
 "use strict";
 /*
@@ -7,7 +7,7 @@
 * http://www.renderjs.org/documentation
 */

-(function (document, window, $) {
+(function (document, window, $, DOMParser) {

  var gadget_model_dict = {},
    gadget_scope_dict = {},
@@ -362,8 +362,12 @@
      };
    if (html.constructor === String) {

-      parsed_xml = $($.parseXML(html));
-
+      // https://developer.mozilla.org/en-US/docs/HTML_in_XMLHttpRequest
+      // https://developer.mozilla.org/en-US/docs/Web/API/DOMParser
+      // https://developer.mozilla.org/en-US/docs/Code_snippets/HTML_to_DOM
+      // parsed_xml = $($.parseXML(html));
+      // parsed_xml = $('<div/>').html(html);
+      parsed_xml = $((new DOMParser()).parseFromString(html, "text/html"));
      settings.title = parsed_xml.find('head > title').first().text();

      // XXX Manage relative URL during extraction of URLs
@@ -501,7 +505,7 @@
 //     // XXX Load gadgets defined in the html
 //     $('body').renderJS('loadGadgetFromDom');

-}(document, window, jQuery));
+}(document, window, jQuery, DOMParser));


 /**

--- a/test/renderjs_test2.js
+++ b/test/renderjs_test2.js
@@ -253,6 +253,20 @@
    deepEqual(settings.required_js_list, [], "JS not found");
  });

+  test('Non valid XML (HTML in fact...)', function () {
+    // Check default value returned by parseGadgetHTML
+    deepEqual(renderJS.parseGadgetHTML('<!doctype html><html><head>' +
+      '<title>Test non valid XML</title>' +
+      '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">' +
+      '</head><body><p>Non valid XML</p></body></html>'), {
+      title: "Test non valid XML",
+      interface_list: [],
+      required_css_list: [],
+      required_js_list: [],
+      html: "<p>Non valid XML</p>",
+    });
+  });
+
  /////////////////////////////////////////////////////////////////
  // declareGadgetKlass
  /////////////////////////////////////////////////////////////////