pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MOV] web, *: simple moves of JS files to 'public' folder

Browse Source 
* web_editor, website, survey, im_livechat

Part of https://github.com/odoo/odoo/pull/29442
task-1932066
This commit is contained in:
qsm-odoo
2019-02-26 17:02:58 +00:00
parent ff9c9341d6
commit 3f4e760f34
8 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/im_livechat/views/im_livechat_channel_templates.xml
+1 -1
View File
@@ -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 -->
addons/survey/views/assets.xml
+1 -1
View File
@@ -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>
addons/web/static/src/js/chrome/public_root_widget.js → addons/web/static/src/js/public/public_root_instance.js
View File
addons/web_editor/static/src/js/root_widget.js → addons/web/static/src/js/public/public_widget.js
View File
addons/web/views/report_templates.xml
+1 -1
View File
@@ -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' />
addons/web/views/webclient_templates.xml
+2 -1
View File
@@ -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">&lt;!DOCTYPE html&gt;
addons/web_editor/views/editor.xml
-3
View File
@@ -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">
addons/website/views/website_templates.xml
+1 -1
View File
@@ -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">