diff options
| author | Lucas Perais (lpe) <lpe@odoo.com> | 2020-08-24 06:13:42 +0000 |
|---|---|---|
| committer | Lucas Perais (lpe) <lpe@odoo.com> | 2020-08-24 06:26:22 +0000 |
| commit | 42e7c01024dcc8f5d0d0ee13c120bd31374837cd (patch) | |
| tree | 374303b200b73c6eecee882abb9ee0696558cb77 /addons | |
| parent | 196c2e72ba5b212eccd2bba7ad33c870e0a40c70 (diff) | |
[FIX] web, website: move keyboard navigation and browser detection in common
Before this commit, the files keyboard_navigation_mixin.js and browser_detection.js
were defined both in assets_backend and in assets_frontend
Obviously then, they should be defined in assets_common, as this commit intends.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 4 | ||||
| -rw-r--r-- | addons/website/views/assets.xml | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 198d8578724..34c9dd5aca0 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -131,9 +131,11 @@ <script type="text/javascript" src="/web/static/src/js/libs/underscore.js"></script> <script type="text/javascript" src="/web/static/src/js/libs/fullcalendar.js"></script> + <script type="text/javascript" src="/web/static/src/js/chrome/keyboard_navigation_mixin.js"></script> <script type="text/javascript" src="/web/static/src/js/core/abstract_service.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/core/ajax.js"></script> + <script type="text/javascript" src="/web/static/src/js/core/browser_detection.js"></script> <script type="text/javascript" src="/web/static/src/js/core/bus.js"></script> <script type="text/javascript" src="/web/static/src/js/core/custom_hooks.js"></script> <script type="text/javascript" src="/web/static/src/js/core/class.js"></script> @@ -253,8 +255,6 @@ <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_act_window.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_report.js"/> <script type="text/javascript" src="/web/static/src/js/chrome/action_mixin.js"/> - <script type="text/javascript" src="/web/static/src/js/core/browser_detection.js"></script> - <script type="text/javascript" src="/web/static/src/js/chrome/keyboard_navigation_mixin.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/abstract_web_client.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/web_client.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/root_widget.js"></script> diff --git a/addons/website/views/assets.xml b/addons/website/views/assets.xml index b4c46e11a13..726328e49f4 100644 --- a/addons/website/views/assets.xml +++ b/addons/website/views/assets.xml @@ -78,9 +78,6 @@ <script type="text/javascript" src="/website/static/lib/jstz.min.js"/> <script type="text/javascript" src="/website/static/src/js/utils.js"/> - <script type="text/javascript" src="/web/static/src/js/core/browser_detection.js"/> - <script type="text/javascript" src="/web/static/src/js/chrome/keyboard_navigation_mixin.js"/> - <script type="text/javascript" src="/website/static/src/js/content/website_root.js"/> <script type="text/javascript" src="/website/static/src/js/content/compatibility.js"/> <script type="text/javascript" src="/website/static/src/js/content/menu.js"/> |