From 15bbadb69b1b26404a614736c3cde7980d3c1dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 5 Dec 2018 14:35:26 +0000
Subject: [PATCH] [REF] im_livechat, mail, website_livechat: clean mail model
 folder

The utility classes `Timer`, `Timers` and `CCThrottleFunction`
were only used by the feature 'is typing...', thus all those files
were in the same folder.

This commit moves the utility classes in a dedicated folder,
and introduces a folder for thread mixins, in preparation for
future features on threads that will be implemented as mixins.
---
 .../views/im_livechat_channel_templates.xml            | 10 +++++-----
 .../thread_typing_mixin.js                             |  0
 .../cc_throttle_function.js                            |  0
 .../{threads/thread_typing_mixin => utils}/timer.js    |  0
 .../{threads/thread_typing_mixin => utils}/timers.js   |  0
 addons/mail/views/mail_templates.xml                   |  9 ++++-----
 addons/website_livechat/views/website_livechat.xml     | 10 +++++-----
 7 files changed, 14 insertions(+), 15 deletions(-)
 rename addons/mail/static/src/js/models/threads/{thread_typing_mixin => mixins}/thread_typing_mixin.js (100%)
 rename addons/mail/static/src/js/models/{threads/thread_typing_mixin => utils}/cc_throttle_function.js (100%)
 rename addons/mail/static/src/js/models/{threads/thread_typing_mixin => utils}/timer.js (100%)
 rename addons/mail/static/src/js/models/{threads/thread_typing_mixin => utils}/timers.js (100%)

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
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js
rename to 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
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js
rename to 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
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js
rename to 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
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js
rename to 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"/>