erp5_xhtml_style/erp5_web_renderjs_ui: Update renderJS 0.22.0

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js

@@ -2103,7 +2103,8 @@ if (typeof document.contains !== 'function') {
       (new DOMParser()).parseFromString(xhr.responseText, "text/html");
     parsed_html = renderJS.parseGadgetHTMLDocument(
       tmp_constructor.__template_element,
-      url
+      url,
+      true
     );
     for (key in parsed_html) {
       if (parsed_html.hasOwnProperty(key)) {
@@ -2208,20 +2209,31 @@ if (typeof document.contains !== 'function') {
   // renderJS.parseGadgetHTMLDocument
   /////////////////////////////////////////////////////////////////
   renderJS.parseGadgetHTMLDocument =
-    function parseGadgetHTMLDocument(document_element, url) {
+    function parseGadgetHTMLDocument(document_element, url,
+                                     update_relative_url) {
       var settings = {
           title: "",
           interface_list: [],
           required_css_list: [],
-          required_js_list: []
+          required_js_list: [],
+          path: url
         },
         i,
-        element;
+        element,
+        element_list,
+        j,
+        url_attribute_list = ['src', 'href', 'srcset'],
+        url_attribute,
+        base_found = false;
 
       if (!url || !isAbsoluteOrDataURL.test(url)) {
         throw new Error("The url should be absolute: " + url);
       }
 
+      if (update_relative_url === undefined) {
+        update_relative_url = false;
+      }
+
       if (document_element.nodeType === 9) {
         settings.title = document_element.title;
 
@@ -2233,23 +2245,54 @@ if (typeof document.contains !== 'function') {
               // element.href returns absolute URL in firefox but "" in chrome;
               if (element.rel === "stylesheet") {
                 settings.required_css_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("href"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("href"),
+                                          settings.path)
                 );
               } else if (element.nodeName === "SCRIPT" &&
                          (element.type === "text/javascript" ||
                           !element.type)) {
                 settings.required_js_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("src"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("src"),
+                                          settings.path)
                 );
               } else if (element.rel ===
                          "http://www.renderjs.org/rel/interface") {
                 settings.interface_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("href"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("href"),
+                                          settings.path)
+                );
+              } else if ((element.nodeName === "BASE") && !base_found &&
+                         element.getAttribute("href")) {
+                settings.path = renderJS.getAbsoluteURL(
+                  element.getAttribute("href"),
+                  settings.path
                 );
+                // Only use the first base element found
+// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base#Usage_notes
+                base_found = true;
               }
             }
           }
         }
+
+        if (update_relative_url && (document_element.body !== null)) {
+          // Resolve all relativeurl configure in the dom as absolute from
+          // the gadget url
+          for (j = 0; j < url_attribute_list.length; j += 1) {
+            url_attribute = url_attribute_list[j];
+            element_list = document_element.body.querySelectorAll(
+              '[' + url_attribute + ']'
+            );
+            for (i = 0; i < element_list.length; i += 1) {
+              element = element_list[i];
+              element.setAttribute(url_attribute, renderJS.getAbsoluteURL(
+                element.getAttribute(url_attribute),
+                settings.path
+              ));
+            }
+          }
+        }
+
       } else {
         throw new Error("The first parameter should be an HTMLDocument");
       }

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml

@@ -148,11 +148,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -196,16 +198,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -228,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                <value> <string>971.50934.11399.39782</string> </value>
+                      <value> <string>981.31793.23133.50602</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -246,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                        <float>1542986111.27</float>
+                              <float>1580395066.9</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
@@ -255,16 +261,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -312,7 +322,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

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

@@ -2103,7 +2103,8 @@ if (typeof document.contains !== 'function') {
       (new DOMParser()).parseFromString(xhr.responseText, "text/html");
     parsed_html = renderJS.parseGadgetHTMLDocument(
       tmp_constructor.__template_element,
-      url
+      url,
+      true
     );
     for (key in parsed_html) {
       if (parsed_html.hasOwnProperty(key)) {
@@ -2208,20 +2209,31 @@ if (typeof document.contains !== 'function') {
   // renderJS.parseGadgetHTMLDocument
   /////////////////////////////////////////////////////////////////
   renderJS.parseGadgetHTMLDocument =
-    function parseGadgetHTMLDocument(document_element, url) {
+    function parseGadgetHTMLDocument(document_element, url,
+                                     update_relative_url) {
       var settings = {
           title: "",
           interface_list: [],
           required_css_list: [],
-          required_js_list: []
+          required_js_list: [],
+          path: url
         },
         i,
-        element;
+        element,
+        element_list,
+        j,
+        url_attribute_list = ['src', 'href', 'srcset'],
+        url_attribute,
+        base_found = false;
 
       if (!url || !isAbsoluteOrDataURL.test(url)) {
         throw new Error("The url should be absolute: " + url);
       }
 
+      if (update_relative_url === undefined) {
+        update_relative_url = false;
+      }
+
       if (document_element.nodeType === 9) {
         settings.title = document_element.title;
 
@@ -2233,23 +2245,54 @@ if (typeof document.contains !== 'function') {
               // element.href returns absolute URL in firefox but "" in chrome;
               if (element.rel === "stylesheet") {
                 settings.required_css_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("href"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("href"),
+                                          settings.path)
                 );
               } else if (element.nodeName === "SCRIPT" &&
                          (element.type === "text/javascript" ||
                           !element.type)) {
                 settings.required_js_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("src"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("src"),
+                                          settings.path)
                 );
               } else if (element.rel ===
                          "http://www.renderjs.org/rel/interface") {
                 settings.interface_list.push(
-                  renderJS.getAbsoluteURL(element.getAttribute("href"), url)
+                  renderJS.getAbsoluteURL(element.getAttribute("href"),
+                                          settings.path)
+                );
+              } else if ((element.nodeName === "BASE") && !base_found &&
+                         element.getAttribute("href")) {
+                settings.path = renderJS.getAbsoluteURL(
+                  element.getAttribute("href"),
+                  settings.path
                 );
+                // Only use the first base element found
+// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base#Usage_notes
+                base_found = true;
               }
             }
           }
         }
+
+        if (update_relative_url && (document_element.body !== null)) {
+          // Resolve all relativeurl configure in the dom as absolute from
+          // the gadget url
+          for (j = 0; j < url_attribute_list.length; j += 1) {
+            url_attribute = url_attribute_list[j];
+            element_list = document_element.body.querySelectorAll(
+              '[' + url_attribute + ']'
+            );
+            for (i = 0; i < element_list.length; i += 1) {
+              element = element_list[i];
+              element.setAttribute(url_attribute, renderJS.getAbsoluteURL(
+                element.getAttribute(url_attribute),
+                settings.path
+              ));
+            }
+          }
+        }
+
       } else {
         throw new Error("The first parameter should be an HTMLDocument");
       }