Merge remote-tracking branch 'upstream/master' into zope4py2

bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/jsstyle.js.js

-/*globals window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
+/*globals window, document, RSVP, rJS, XMLHttpRequest, URL,
           history, console */
 /*jslint indent: 2, maxlen: 80*/
-(function (window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
+(function (window, document, RSVP, rJS, XMLHttpRequest, URL,
           loopEventListener, history, console) {
   "use strict";
 
@@ -295,7 +295,7 @@
       style_gadget: gadget.getDeclaredGadget('renderer')
     }))
       .push(function (result_dict) {
-        var dom_parser = (new DOMParser()).parseFromString(
+        var dom_parser = rJS.parseDocumentStringOrFail(
           result_dict.xhr.responseText,
           'text/html'
         ),
@@ -472,5 +472,5 @@
   // with browsers without javascript
   hidePage();
 
-}(window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
+}(window, document, RSVP, rJS, XMLHttpRequest, URL,
   rJS.loopEventListener, history, console));
\ No newline at end of file

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js

@@ -781,6 +781,32 @@ if (typeof document.contains !== 'function') {
   ScopeError.prototype = new Error();
   ScopeError.prototype.constructor = ScopeError;
 
+  //////////////////////////////////////////
+  // ParserError
+  //////////////////////////////////////////
+  function DOMParserError(message) {
+    this.name = "DOMParserError";
+    if ((message !== undefined) && (typeof message !== "string")) {
+      throw new TypeError('You must pass a string for DOMParserError.');
+    }
+    this.message = message || "Default Message";
+  }
+  DOMParserError.prototype = new Error();
+  DOMParserError.prototype.constructor = DOMParserError;
+
+  //////////////////////////////////////////
+  // DOMParser
+  //////////////////////////////////////////
+  function parseDocumentStringOrFail(string, mime_type) {
+    var doc = new DOMParser().parseFromString(string, mime_type),
+      error_node = doc.querySelector('parsererror');
+    if (error_node !== null) {
+      // parsing failed
+      throw new DOMParserError(error_node.textContent);
+    }
+    return doc;
+  }
+
   /////////////////////////////////////////////////////////////////
   // renderJS.IframeSerializationError
   /////////////////////////////////////////////////////////////////
@@ -1901,8 +1927,7 @@ if (typeof document.contains !== 'function') {
       .push(function handleDataURLAjaxResponse(xhr) {
         // Insert a "base" element, in order to resolve all relative links
         // which could get broken with a data url
-        var doc = (new DOMParser()).parseFromString(xhr.responseText,
-                                                    'text/html'),
+        var doc = parseDocumentStringOrFail(xhr.responseText, 'text/html'),
           base = doc.createElement('base'),
           blob;
         base.href = url;
@@ -2200,7 +2225,7 @@ if (typeof document.contains !== 'function') {
     // https://developer.mozilla.org/en-US/docs/Web/API/DOMParser
     // https://developer.mozilla.org/en-US/docs/Code_snippets/HTML_to_DOM
     tmp_constructor.__template_element =
-      (new DOMParser()).parseFromString(xhr.responseText, "text/html");
+      parseDocumentStringOrFail(xhr.responseText, "text/html");
     parsed_html = renderJS.parseGadgetHTMLDocument(
       tmp_constructor.__template_element,
       url,
@@ -2406,6 +2431,8 @@ if (typeof document.contains !== 'function') {
   renderJS.ScopeError = ScopeError;
   renderJS.IframeSerializationError = IframeSerializationError;
   renderJS.loopEventListener = loopEventListener;
+  renderJS.DOMParserError = DOMParserError;
+  renderJS.parseDocumentStringOrFail = parseDocumentStringOrFail;
   window.rJS = window.renderJS = renderJS;
   window.__RenderJSGadget = RenderJSGadget;
   window.__RenderJSEmbeddedGadget = RenderJSEmbeddedGadget;

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>996.23761.26725.45789</string> </value>
+                      <value> <string>998.17699.36537.24439</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1641216662.48</float>
+                              <float>1668780748.06</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js

@@ -781,6 +781,32 @@ if (typeof document.contains !== 'function') {
   ScopeError.prototype = new Error();
   ScopeError.prototype.constructor = ScopeError;
 
+  //////////////////////////////////////////
+  // ParserError
+  //////////////////////////////////////////
+  function DOMParserError(message) {
+    this.name = "DOMParserError";
+    if ((message !== undefined) && (typeof message !== "string")) {
+      throw new TypeError('You must pass a string for DOMParserError.');
+    }
+    this.message = message || "Default Message";
+  }
+  DOMParserError.prototype = new Error();
+  DOMParserError.prototype.constructor = DOMParserError;
+
+  //////////////////////////////////////////
+  // DOMParser
+  //////////////////////////////////////////
+  function parseDocumentStringOrFail(string, mime_type) {
+    var doc = new DOMParser().parseFromString(string, mime_type),
+      error_node = doc.querySelector('parsererror');
+    if (error_node !== null) {
+      // parsing failed
+      throw new DOMParserError(error_node.textContent);
+    }
+    return doc;
+  }
+
   /////////////////////////////////////////////////////////////////
   // renderJS.IframeSerializationError
   /////////////////////////////////////////////////////////////////
@@ -1901,8 +1927,7 @@ if (typeof document.contains !== 'function') {
       .push(function handleDataURLAjaxResponse(xhr) {
         // Insert a "base" element, in order to resolve all relative links
         // which could get broken with a data url
-        var doc = (new DOMParser()).parseFromString(xhr.responseText,
-                                                    'text/html'),
+        var doc = parseDocumentStringOrFail(xhr.responseText, 'text/html'),
           base = doc.createElement('base'),
           blob;
         base.href = url;
@@ -2200,7 +2225,7 @@ if (typeof document.contains !== 'function') {
     // https://developer.mozilla.org/en-US/docs/Web/API/DOMParser
     // https://developer.mozilla.org/en-US/docs/Code_snippets/HTML_to_DOM
     tmp_constructor.__template_element =
-      (new DOMParser()).parseFromString(xhr.responseText, "text/html");
+      parseDocumentStringOrFail(xhr.responseText, "text/html");
     parsed_html = renderJS.parseGadgetHTMLDocument(
       tmp_constructor.__template_element,
       url,
@@ -2406,6 +2431,8 @@ if (typeof document.contains !== 'function') {
   renderJS.ScopeError = ScopeError;
   renderJS.IframeSerializationError = IframeSerializationError;
   renderJS.loopEventListener = loopEventListener;
+  renderJS.DOMParserError = DOMParserError;
+  renderJS.parseDocumentStringOrFail = parseDocumentStringOrFail;
   window.rJS = window.renderJS = renderJS;
   window.__RenderJSGadget = RenderJSGadget;
   window.__RenderJSEmbeddedGadget = RenderJSEmbeddedGadget;