Skip to content

erp5
erp5
Commit 456089dc authored by Romain Courteaud's avatar Romain Courteaud Committed by Rafael Monnerat
Browse files
Options

erp5_web_js_style: do not crash if style gadget can't be loaded 

Try to support displaying web js site from google cache,
which can not access original gadget, due to cross origin ajax query forbidden.

Display original content instead and load the default CSS in such case.
parent 604b0ebd
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 17 deletions
bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/jsstyle.js.js
View file @ 456089dc
/*globals window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL, /*globals window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
loopEventListener, history */ loopEventListener, history, console */
/*jslint indent: 2, maxlen: 80*/ /*jslint indent: 2, maxlen: 80*/
(function (window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL, (function (window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
loopEventListener, history) { loopEventListener, history, console) {
"use strict"; "use strict";
// XXX Copy/paste from renderjs // XXX Copy/paste from renderjs
...@@ -110,11 +110,10 @@ ...@@ -110,11 +110,10 @@
} }
function parseFormElement(form_element) { function parseFormElement(form_element) {
var result;
if (form_element !== null) { if (form_element !== null) {
return form_element.outerHTML; return form_element.outerHTML;
} }
return result; return;
} }
function parseStatusMessage(status_element, information_element) { function parseStatusMessage(status_element, information_element) {
...@@ -130,6 +129,7 @@ ...@@ -130,6 +129,7 @@
function parsePageContent(body_element) { function parsePageContent(body_element) {
return { return {
original_content: body_element.innerHTML,
html_content: body_element.querySelector('main').innerHTML, html_content: body_element.querySelector('main').innerHTML,
language_list: parseLanguageElement( language_list: parseLanguageElement(
body_element.querySelector('nav#language') body_element.querySelector('nav#language')
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
portal_status_message: parseStatusMessage( portal_status_message: parseStatusMessage(
body_element.querySelector('p#portal_status_message'), body_element.querySelector('p#portal_status_message'),
body_element.querySelector('p#information_area') body_element.querySelector('p#information_area')
), )
}; };
} }
...@@ -315,20 +315,28 @@ ...@@ -315,20 +315,28 @@
.push(function (result) { .push(function (result) {
style_gadget = result; style_gadget = result;
return style_gadget.render(parsed_content.html_content, return style_gadget.render(parsed_content.html_content,
parsed_content); parsed_content)
}) .push(function () {
.push(function () { // Trigger URL handling
// Trigger URL handling gadget.listenURLChange();
gadget.listenURLChange();
body.appendChild(style_gadget.element);
body.appendChild(style_gadget.element); gadget.element.hidden = false;
gadget.element.hidden = false; scrollToHash(window.location.hash);
scrollToHash(window.location.hash); }, function (error) {
gadget.element.hidden = false;
throw error;
});
}, function (error) { }, function (error) {
gadget.element.hidden = false; console.warn('Cant load the style gadget', error);
throw error; return new RSVP.Queue(rJS.declareCSS("jsstyle.css", document.head))
.push(function () {
// Set again the page content after the css is loaded
// to prevent ugly rendering
gadget.element.innerHTML = parsed_content.original_content;
});
}); });
}); });
}(window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL, }(window, document, RSVP, rJS, XMLHttpRequest, DOMParser, URL,
loopEventListener, history)); loopEventListener, history, console));
\ No newline at end of file \ No newline at end of file
bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleDemoStyle.zpt
View file @ 456089dc
...@@ -78,6 +78,12 @@ ...@@ -78,6 +78,12 @@
<td></td> <td></td>
</tr> </tr>
<tr>
<td>assertElementNotPresent</td>
<td>//head/link[@rel='stylesheet' and @href='jsstyle.css']</td>
<td></td>
</tr>
</tbody></table> </tbody></table>
</body> </body>
</html> </html>
\ No newline at end of file
bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleNoStyle.zpt
View file @ 456089dc
...@@ -38,6 +38,17 @@ ...@@ -38,6 +38,17 @@
<td></td> <td></td>
</tr> </tr>
<tr>
<td>waitForElementPresent</td>
<td>//head/link[@rel='stylesheet' and @href='jsstyle.css']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//head/link[@rel='stylesheet' and @href='jsstyle.css']</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//nav[@id='sitemap']/a[text()='No Style']</td> <td>//nav[@id='sitemap']/a[text()='No Style']</td>
......
bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleNotLoadingStyle.xml 0 → 100644
View file @ 456089dc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testJsStyleNotLoadingStyle</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_js_style_test/PathTemplateItem/portal_tests/js_style_zuite/testJsStyleNotLoadingStyle.zpt 0 → 100644
View file @ 456089dc
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Test JS Style Demo Style</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Test JS Style Demo Style</td></tr>
</thead><tbody>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
<tr>
<td>open</td>
<td>${base_url}/ERP5Site_createWebJSStyleZuiteTestData?configuration=not_loading</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Web Site created.</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<!-- Initialize -->
<tr>
<td>open</td>
<td>${base_url}/web_site_module/erp5_web_js_style_test_site/</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//head/link[@rel='prerender' and @href='jsstyle_demo_not_loading.html']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//head/link[@rel='stylesheet' and @href='jsstyle.css']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//head/link[@rel='stylesheet' and @href='jsstyle.css']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//nav[@id='sitemap']/a[text()='Not Loading Style']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//nav[@id='sitemap']/a[text()='Not Loading Style']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//nav[@id='language']//a[@hreflang='en']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@class='input']/span[@class='headline' and text()='Not Loading Style']</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
bt5/erp5_web_js_style_test/SkinTemplateItem/portal_skins/erp5_web_js_style_test/ERP5Site_createWebJSStyleZuiteTestData.py
View file @ 456089dc
...@@ -129,6 +129,10 @@ configuration_dict = { ...@@ -129,6 +129,10 @@ configuration_dict = {
'configuration_style_gadget_url': "jsstyle_demo.html", 'configuration_style_gadget_url': "jsstyle_demo.html",
'title': "Demo Style", 'title': "Demo Style",
}, },
'not_loading': {
'configuration_style_gadget_url': "jsstyle_demo_not_loading.html",
'title': "Not Loading Style",
},
'favicon': { 'favicon': {
'title': 'Favicon', 'title': 'Favicon',
'configuration_favicon_url': "favicon.ico" 'configuration_favicon_url': "favicon.ico"
......
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