summaryrefslogtreecommitdiff
path: root/addons/website_livechat/views
diff options
context:
space:
mode:
authorSébastien Theys <seb@odoo.com>2020-06-15 18:12:21 +0000
committerSébastien Theys <seb@odoo.com>2020-06-15 18:12:21 +0000
commit3fea5b2136627c1d7e83b2a5e111952fe3eb10a1 (patch)
tree5eefad07972a87ce4689b83260f981bc87aadad4 /addons/website_livechat/views
parent0a82848606151ef60eb6523e9c4c161171f214e7 (diff)
[REF] mail, *: refactor messaging with OWL
This commit is a significant rewriting of client-side discuss, chatter, chat window, and messaging menu using OWL. The behavior should be broadly the same, with some slight functional changes here and there. From a technical standpoint, the code of messaging is mainly organized in 2 main groups of modules: - models, which are logical entities that depict the client-side state of messaging as a whole. - components, which are in charge of displaying information from models. This refactoring also introduces new JS guidelines regarding folder structure (/static) and naming rules for JS modules. Community PR: https://github.com/odoo/odoo/pull/39023 Enterprise PR: https://github.com/odoo/enterprise/pull/6249 Task-1914207 This PR is a collaborative work by Alexandre, Julien, Sébastien and Xavier, with the precious help of Lucas to speed it up towards the end. closes odoo/odoo#39023 Related: odoo/enterprise#6249 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com> Co-authored-by: Alexandre Kühn <aku@odoo.com> Co-authored-by: Julien Giannone <jgi@odoo.com> Co-authored-by: Lucas Perais <lpe@odoo.com> Co-authored-by: Sébastien Theys <seb@odoo.com> Co-authored-by: Xavier Dubuc <xdu@odoo.com>
Diffstat (limited to 'addons/website_livechat/views')
-rw-r--r--addons/website_livechat/views/assets.xml16
-rw-r--r--addons/website_livechat/views/website_livechat.xml32
2 files changed, 21 insertions, 27 deletions
diff --git a/addons/website_livechat/views/assets.xml b/addons/website_livechat/views/assets.xml
index 42a6f1bacd1..0311dbdf6e8 100644
--- a/addons/website_livechat/views/assets.xml
+++ b/addons/website_livechat/views/assets.xml
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
+
+ <template id="assets_backend" name="website livechat assets" inherit_id="web.assets_backend">
+ <xpath expr="script[last()]" position="after">
+ <script type="text/javascript" src="/website_livechat/static/src/bugfix/bugfix.js"></script>
+ </xpath>
+ <xpath expr="link[last()]" position="after">
+ <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/bugfix/bugfix.scss"/>
+ </xpath>
+ </template>
+
<template id="assets_tests" name="Website Livechat Assets Tests" inherit_id="web.assets_tests">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_livechat/static/tests/tours/website_livechat_common.js"></script>
@@ -8,5 +18,11 @@
<script type="text/javascript" src="/website_livechat/static/tests/tours/website_livechat_request.js"></script>
</xpath>
</template>
+
+ <template id="qunit_suite" name="website_livechat_tests" inherit_id="web.qunit_suite_tests">
+ <xpath expr="." position="inside">
+ <script type="text/javascript" src="/website_livechat/static/src/bugfix/bugfix_tests.js"></script>
+ </xpath>
+ </template>
</data>
</odoo>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index f961e862679..210d7398e00 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -3,10 +3,6 @@
<data>
<template id="assets_backend" inherit_id="website.assets_backend" name="website_livechat assets backend">
<xpath expr="." position="inside">
- <!-- Visitor Chat Request -->
- <script type="text/javascript" src="/website_livechat/static/src/js/thread_window.js"></script>
- <script type="text/javascript" src="/website_livechat/static/src/js/channel.js"></script>
- <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/scss/mail_thread_visitor_info.scss"/>
</xpath>
</template>
@@ -16,32 +12,14 @@
-->
<template id="assets_frontend" name="im_livechat assets frontend" inherit_id="website.assets_frontend">
<xpath expr="." position="inside">
- <!-- thread window -->
- <script type="text/javascript" src="/mail/static/src/js/thread_windows/abstract_thread_window.js"></script>
- <script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
-
- <script type="text/javascript" src="/mail/static/src/js/document_viewer.js"></script>
- <script type="text/javascript" src="/mail/static/src/js/thread_widget.js"></script>
<script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
- <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat.js"></script>
- <!-- Models -->
- <!-- threads -->
- <script type="text/javascript" src="/mail/static/src/js/models/threads/abstract_thread.js"></script>
- <script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat.js"></script>
- <script type="text/javascript" src="/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js"></script>
- <!-- messages -->
- <script type="text/javascript" src="/mail/static/src/js/models/messages/abstract_message.js"></script>
- <script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat_message.js"></script>
- <!-- utils -->
- <script type="text/javascript" src="/mail/static/src/js/models/utils/timer.js"></script>
- <script type="text/javascript" src="/mail/static/src/js/models/utils/timers.js"></script>
- <script type="text/javascript" src="/mail/static/src/js/models/utils/cc_throttle_function.js"></script>
+ <script type="text/javascript" src="/website_livechat/static/src/bugfix/public_bugfix.js"></script>
+ <script type="text/javascript" src="/im_livechat/static/src/legacy/public_livechat.js"></script>
<!--Chat Request-->
- <script type="text/javascript" src="/website_livechat/static/src/js/im_livechat.js"></script>
+ <script type="text/javascript" src="/website_livechat/static/src/legacy/public_livechat.js"></script>
<!--Stylesheets-->
- <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/abstract_thread_window.scss"></link>
- <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/thread.scss"></link>
- <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/scss/im_livechat.scss"/>
+ <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/legacy/public_livechat.scss"/>
+ <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/bugfix/public_bugfix.scss"/>
</xpath>
</template>