Skip to content

erp5
erp5
Commit a43e825d authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

erp5_xhtml_style/erp5_web_renderjs_ui: Update renderJS 0.22.0

parent 94053d30
Pipeline #7792 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 263 additions and 165 deletions
    bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
    View file @ a43e825d
    ......@@ -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
    View file @ a43e825d
    ......@@ -148,171 +148,183 @@
    </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/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>cedric.le.ninivin</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1440175545.67</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>cedric.le.ninivin</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1440175545.67</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    </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/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>971.50934.11399.39782</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1542986111.27</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>981.31793.23133.50602</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1580395066.9</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </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/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>cedric.le.ninivin</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1440175328.89</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>cedric.le.ninivin</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1440175328.89</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js
    View file @ a43e825d
    ......@@ -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");
    }
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7