diff options
| author | qsm-odoo <qsm@odoo.com> | 2019-02-13 15:21:03 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-02-26 17:02:58 +0000 |
| commit | 3f4e760f34b4e961ccc5587d5d1cb6eed1680e2a (patch) | |
| tree | 49fc07e685e74e149885128cf8bd2bde68dc5703 /addons | |
| parent | ff9c9341d6ed4e9ab18a0aa02e79441999d658f1 (diff) | |
[MOV] web, *: simple moves of JS files to 'public' folder
* web_editor, website, survey, im_livechat
Part of https://github.com/odoo/odoo/pull/29442
task-1932066
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/im_livechat/views/im_livechat_channel_templates.xml | 2 | ||||
| -rw-r--r-- | addons/survey/views/assets.xml | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/public/public_root_instance.js (renamed from addons/web/static/src/js/chrome/public_root_widget.js) | 0 | ||||
| -rw-r--r-- | addons/web/static/src/js/public/public_widget.js (renamed from addons/web_editor/static/src/js/root_widget.js) | 0 | ||||
| -rw-r--r-- | addons/web/views/report_templates.xml | 2 | ||||
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 3 | ||||
| -rw-r--r-- | addons/web_editor/views/editor.xml | 3 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 2 |
8 files changed, 6 insertions, 8 deletions
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index d029ae32478..90199615161 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -147,7 +147,7 @@ <script type="text/javascript" src="/web/static/src/js/core/local_storage.js"></script> <script type="text/javascript" src="/web/static/src/js/core/ram_storage.js"></script> <script type="text/javascript" src="/web/static/src/js/core/abstract_storage_service.js"></script> - <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script> + <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"></script> <script type="text/javascript" src="/web/static/src/js/services/ajax_service.js"></script> <script type="text/javascript" src="/web/static/src/js/services/local_storage_service.js"></script> <!-- Bus, Mail, Livechat --> diff --git a/addons/survey/views/assets.xml b/addons/survey/views/assets.xml index 4cfef754e36..90db69d356e 100644 --- a/addons/survey/views/assets.xml +++ b/addons/survey/views/assets.xml @@ -5,7 +5,7 @@ <template id="survey_assets" name="Survey Results assets"> <script src="/web/static/lib/nvd3/d3.v3.js"></script> <script src="/web/static/lib/nvd3/nv.d3.js"></script> - <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script> + <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"></script> <script type="text/javascript" src="/web/static/src/js/services/session.js"></script> <script type="text/javascript" src="/web/static/src/js/fields/field_utils.js"></script> diff --git a/addons/web/static/src/js/chrome/public_root_widget.js b/addons/web/static/src/js/public/public_root_instance.js index ce0cfa61bc6..ce0cfa61bc6 100644 --- a/addons/web/static/src/js/chrome/public_root_widget.js +++ b/addons/web/static/src/js/public/public_root_instance.js diff --git a/addons/web_editor/static/src/js/root_widget.js b/addons/web/static/src/js/public/public_widget.js index 462dcd9bae9..462dcd9bae9 100644 --- a/addons/web_editor/static/src/js/root_widget.js +++ b/addons/web/static/src/js/public/public_widget.js diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml index f67e9c4023e..f53a56f51ff 100644 --- a/addons/web/views/report_templates.xml +++ b/addons/web/views/report_templates.xml @@ -23,7 +23,7 @@ <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_boxed.scss"/> <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_clean.scss"/> - <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"/> + <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/> <script type="text/javascript" src="/web/static/src/js/services/session.js"/> <script type="text/javascript" src="/web/static/src/js/report/utils.js"/> <script type="text/javascript" src='/web/static/src/js/report/report.js' /> diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 99da7f30cea..8ac3e7671fe 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -341,7 +341,8 @@ <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/navbar_mobile.scss"/> <script type="text/javascript" src="/web/static/src/js/services/session.js"></script> - <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script> + <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/> + <script type="text/javascript" src="/web/static/src/js/public/public_widget.js"/> </template> <template id="web.layout" name="Web layout"><!DOCTYPE html> diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml index cc61084a603..6bbf98f9b30 100644 --- a/addons/web_editor/views/editor.xml +++ b/addons/web_editor/views/editor.xml @@ -135,9 +135,6 @@ <xpath expr="//link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context --> </xpath> - <xpath expr="//script[last()]" position="after"> - <script type="text/javascript" src="/web_editor/static/src/js/root_widget.js"/> - </xpath> </template> <template id="qunit_suite" inherit_id="web.qunit_suite"> diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 3ec2fe607ef..cf64158cb74 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -58,7 +58,7 @@ <!-- Custom empty file for user custom rules --> <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/user_custom_rules.scss"/> </xpath> - <xpath expr="//script[@src='/web/static/src/js/chrome/public_root_widget.js']" position="replace"> + <xpath expr="//script[@src='/web/static/src/js/public/public_root_instance.js']" position="replace"> <script type="text/javascript" src="/website/static/src/js/content/website_root.js"/> </xpath> <xpath expr="//script[last()]" position="after"> |
