Commit 44b5734c authored by Romain Courteaud's avatar Romain Courteaud

Revert "erp5_web_js_style: using a noscript attribute seems one way to not load images by default"

This reverts commit 9db63346.
parent 11813c70
...@@ -228,32 +228,21 @@ ...@@ -228,32 +228,21 @@
j, j,
url_attribute_list = ['src', 'href', 'srcset', 'action'], url_attribute_list = ['src', 'href', 'srcset', 'action'],
url_attribute, url_attribute,
feed_url = null, feed_url = null;
new_element;
//body_element = body_element.content.cloneNode(true);
// Improve img rendering by default to reduce size
element_list = body_element.querySelectorAll('noscript');
for (i = 0; i < element_list.length; i += 1) {
element = element_list[i];
new_element = document.createElement('div');
new_element.innerHTML = element.textContent;
element.parentNode.replaceChild(new_element, element);
}
// Improve img rendering by default to reduce size // Improve img rendering by default to reduce size
element_list = body_element.querySelectorAll('img'); element_list = body_element.querySelectorAll('img');
for (i = 0; i < element_list.length; i += 1) { for (i = 0; i < element_list.length; i += 1) {
element = element_list[i]; element = element_list[i];
if (!element.getAttribute('loading')) { if (!element.getAttribute('loading')) {
element.loading = 'lazy'; element.setAttribute('loading', 'lazy');
} }
feed_url = element.getAttribute('src'); feed_url = element.getAttribute('src');
if ((feed_url) && if ((feed_url) &&
(feed_url.indexOf('/') === -1)) { (feed_url.indexOf('/') === -1)) {
feed_url = feed_url.split('?')[0] + feed_url = feed_url.split('?')[0] +
'?format=jpg&display=small&quality=90'; '?format=jpg&display=small&quality=90';
element.src = feed_url; element.setAttribute('src', feed_url);
} }
} }
...@@ -421,7 +410,6 @@ ...@@ -421,7 +410,6 @@
var gadget = this, var gadget = this,
style_gadget, style_gadget,
body = gadget.element, body = gadget.element,
new_parent,
style_gadget_url = body.getAttribute("data-nostyle-gadget-url"), style_gadget_url = body.getAttribute("data-nostyle-gadget-url"),
style_css_url = body.getAttribute("data-nostyle-css-url"), style_css_url = body.getAttribute("data-nostyle-css-url"),
parsed_content; parsed_content;
...@@ -431,15 +419,6 @@ ...@@ -431,15 +419,6 @@
return rJS.declareCSS(style_css_url, document.head); return rJS.declareCSS(style_css_url, document.head);
} }
// XXX detach the element from the DOM, to prevent auto loading of image
// Clear the DOM
/*
new_parent = document.createElement('template');
while (body.firstChild) {
new_parent.appendChild(body.firstChild);
}
*/
parsed_content = parsePageContent( parsed_content = parsePageContent(
gadget.element, gadget.element,
document.documentElement.lang, document.documentElement.lang,
...@@ -453,7 +432,6 @@ ...@@ -453,7 +432,6 @@
while (body.firstChild) { while (body.firstChild) {
body.firstChild.remove(); body.firstChild.remove();
} }
return gadget.declareGadget(style_gadget_url, {scope: 'renderer'}) return gadget.declareGadget(style_gadget_url, {scope: 'renderer'})
.push(function (result) { .push(function (result) {
style_gadget = result; style_gadget = result;
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<tal:block tal:content="structure python: web_section.WebSection_generateNavigationHTML(include_document=include_document)"></tal:block> <tal:block tal:content="structure python: web_section.WebSection_generateNavigationHTML(include_document=include_document)"></tal:block>
<p tal:content="request/portal_status_message | nothing" id="portal_status_message"/> <p tal:content="request/portal_status_message | nothing" id="portal_status_message"/>
<main><noscript><tal:block metal:define-slot="main"/></noscript></main> <main><tal:block metal:define-slot="main"/></main>
</body> </body>
</html> </html>
</tal:block> </tal:block>
......
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