diff options
| -rw-r--r-- | addons/im_livechat/views/im_livechat_channel_templates.xml | 10 | ||||
| -rw-r--r-- | addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js (renamed from addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js) | 0 | ||||
| -rw-r--r-- | addons/mail/static/src/js/models/utils/cc_throttle_function.js (renamed from addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js) | 0 | ||||
| -rw-r--r-- | addons/mail/static/src/js/models/utils/timer.js (renamed from addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js) | 0 | ||||
| -rw-r--r-- | addons/mail/static/src/js/models/utils/timers.js (renamed from addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js) | 0 | ||||
| -rw-r--r-- | addons/mail/views/mail_templates.xml | 9 | ||||
| -rw-r--r-- | addons/website_livechat/views/website_livechat.xml | 10 |
7 files changed, 14 insertions, 15 deletions
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index f47a5c0a591..a736c33d3f0 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -166,14 +166,14 @@ <!-- 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> - <!-- thread typing mixin --> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timer.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timers.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.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> <t t-call="web._assets_helpers"/> <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/scss/im_livechat_bootstrap.scss"/> <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/abstract_thread_window.scss"></link> diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js b/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js index 9a5b5abb4cc..9a5b5abb4cc 100644 --- a/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js +++ b/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js b/addons/mail/static/src/js/models/utils/cc_throttle_function.js index b4b87087e6d..b4b87087e6d 100644 --- a/addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js +++ b/addons/mail/static/src/js/models/utils/cc_throttle_function.js diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js b/addons/mail/static/src/js/models/utils/timer.js index a3236fd1a16..a3236fd1a16 100644 --- a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js +++ b/addons/mail/static/src/js/models/utils/timer.js diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js b/addons/mail/static/src/js/models/utils/timers.js index 757945223f7..757945223f7 100644 --- a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js +++ b/addons/mail/static/src/js/models/utils/timers.js diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml index efe7657e192..b9fe174e470 100644 --- a/addons/mail/views/mail_templates.xml +++ b/addons/mail/views/mail_templates.xml @@ -35,11 +35,10 @@ <script type="text/javascript" src="/mail/static/src/js/models/threads/mailbox.js"></script> <script type="text/javascript" src="/mail/static/src/js/models/threads/searchable_thread.js"></script> <script type="text/javascript" src="/mail/static/src/js/models/threads/thread.js"></script> - <!-- thread typing mixin --> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timer.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timers.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js"></script> + <script type="text/javascript" src="/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js"></script> + <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> <!-- Widgets --> <!-- thread windows --> <script type="text/javascript" src="/mail/static/src/js/thread_windows/abstract_thread_window.js"></script> diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml index a76f5503029..e5f429fc806 100644 --- a/addons/website_livechat/views/website_livechat.xml +++ b/addons/website_livechat/views/website_livechat.xml @@ -24,14 +24,14 @@ <!-- 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> - <!-- thread typing mixin --> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timer.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/timers.js"></script> - <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.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> <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"/> |