From caee53448ebd67f4eea6da7f6c1501655ddf50e3 Mon Sep 17 00:00:00 2001 From: Romain Courteaud Date: Fri, 28 Oct 2016 13:10:52 +0000 Subject: [PATCH] [erp5_web_renderjs_ui] Stop setting local CSS Support will be removed with CSP --- bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js | 5 ----- bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml | 4 ++-- bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css | 2 +- bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml | 4 ++-- bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js index 908a873..43d460a 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.js @@ -83,11 +83,6 @@ if (field_json.css_class) { gadget_element.setAttribute("class", field_json.css_class); } - if (field_json.sandbox === "iframe") { - iframe = gadget_element.querySelector("iframe"); - iframe.style.width = "100%"; - iframe.style.height = "100%"; - } // Trigger render methods gadget.props.field_gadget = field_gadget; gadget.props.service_deferred.resolve(field_gadget); diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml index dcd3a2b..2888821 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_gadgetfield_js.xml @@ -230,7 +230,7 @@ serial - 948.41569.55434.38451 + 954.58962.6524.44134 state @@ -248,7 +248,7 @@ - 1453977502.69 + 1477660162.48 UTC diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css index 665dfd5..d713467 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css @@ -432,7 +432,7 @@ svg text { } iframe { width: 100%; - height: 25em; + height: 50em; background-color: white; } img { diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml index 5730053..9b6bb12 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml @@ -236,7 +236,7 @@ serial - 954.44246.45584.9130 + 954.58960.41752.27153 state @@ -254,7 +254,7 @@ - 1476777160.07 + 1477660036.34 UTC diff --git a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt index 2472443..5f0620c 100644 --- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt +++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt @@ -499,7 +499,7 @@ svg { iframe { width: 100%; - height: 25em; + height: 50em; background-color: white; } -- libgit2 0.24.0