diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-09-30 14:20:23 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-10-01 14:00:19 +0200 |
| commit | b47c2b955b431b2bb5b0f427fce0a7776451fb2f (patch) | |
| tree | e9c8224caf9c4e1f457590836bca35edbe671755 | |
| parent | b105a37534a7d6c8b826dcd80c5f66625dd456b8 (diff) | |
[FIX] im_livechat: temporarily disable client code
This is done because of large mail refactoring and the need of quick release.
We will rewrite it asap.
| -rw-r--r-- | addons/im_livechat/static/src/js/im_livechat.js | 5 | ||||
| -rw-r--r-- | addons/im_livechat/static/src/js/im_livechat_backend.js | 3 | ||||
| -rw-r--r-- | addons/im_livechat/static/src/less/im_livechat.less (renamed from addons/im_livechat/static/src/css/im_livechat.css) | 0 | ||||
| -rw-r--r-- | addons/im_livechat/static/src/xml/im_livechat_backend.xml | 5 | ||||
| -rw-r--r-- | addons/im_livechat/views/im_livechat_channel_templates.xml | 9 |
5 files changed, 13 insertions, 9 deletions
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js index 7ff644f0e0a..40a712e68df 100644 --- a/addons/im_livechat/static/src/js/im_livechat.js +++ b/addons/im_livechat/static/src/js/im_livechat.js @@ -7,11 +7,14 @@ var user_session = require('web.session'); var time = require('web.time'); var utils = require('web.utils'); var Widget = require('web.Widget'); -var mail_chat_common = require('mail.chat_common'); +// var mail_chat_common = require('mail.chat_common'); var _t = core._t; var QWeb = core.qweb; +return { + LivechatButton: Widget, +}; /* * Conversation Patch diff --git a/addons/im_livechat/static/src/js/im_livechat_backend.js b/addons/im_livechat/static/src/js/im_livechat_backend.js index bc970d37e06..646d1b8c7df 100644 --- a/addons/im_livechat/static/src/js/im_livechat_backend.js +++ b/addons/im_livechat/static/src/js/im_livechat_backend.js @@ -1,7 +1,8 @@ odoo.define('im_livechat.chat_backend', function (require) { "use strict"; -var mail_chat_backend = require('mail.chat_backend'); +// var mail_chat_backend = require('mail.chat_backend'); +return; /** diff --git a/addons/im_livechat/static/src/css/im_livechat.css b/addons/im_livechat/static/src/less/im_livechat.less index 746d3f3d894..746d3f3d894 100644 --- a/addons/im_livechat/static/src/css/im_livechat.css +++ b/addons/im_livechat/static/src/less/im_livechat.less diff --git a/addons/im_livechat/static/src/xml/im_livechat_backend.xml b/addons/im_livechat/static/src/xml/im_livechat_backend.xml index 456e293a093..e371a0b9723 100644 --- a/addons/im_livechat/static/src/xml/im_livechat_backend.xml +++ b/addons/im_livechat/static/src/xml/im_livechat_backend.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <template> - <t t-extend="mail.chat.ChatMailThread.channels"> +<!-- <t t-extend="mail.chat.ChatMailThread.channels"> <t t-jquery="li > a" t-operation="append"> <t t-if="channel.channel_type === 'livechat'"> <span class="fa fa-times pull-right o_mail_chat_channel_unpin" t-att-title="_t('Close')" t-att-data-channel-id="channel.id"/> @@ -11,12 +11,11 @@ <t t-extend="mail.chat.ChatMailThread"> <t t-jquery=".o_mail_chat_sidebar" t-operation="append"> - <!-- Livechat list --> <h4 class="o_mail_chat_sidebar_title"><t t-esc="_t('Livechat')"/></h4> <t t-call="mail.chat.ChatMailThread.channels"> <t t-set="channel_slot" t-value="'channel_livechat'"/> </t> </t> - </t> + </t> --> </template> diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index e491635111b..19882bcb34e 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -125,11 +125,12 @@ <script type="text/javascript" src="/web/static/src/js/framework/core.js"></script> <!-- Bus, Mail, Livechat --> <script type="text/javascript" src="/bus/static/src/js/bus.js"></script> - <script type="text/javascript" src="/mail/static/src/js/mail_utils.js"></script> - <script type="text/javascript" src="/mail/static/src/js/mail_chat_common.js"></script> + <script type="text/javascript" src="/mail/static/src/js/chat_window.js"></script> + <script type="text/javascript" src="/mail/static/src/js/thread.js"></script> <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat.js"></script> - <link rel="stylesheet" href="/mail/static/src/less/mail_chat_common.less"></link> - <link rel="stylesheet" href="/im_livechat/static/src/css/im_livechat.css"/> + <link rel="stylesheet" href="/mail/static/src/less/chat_window.less"></link> + <link rel="stylesheet" href="/mail/static/src/less/thread.less"></link> + <link rel="stylesheet" href="/im_livechat/static/src/less/im_livechat.less"/> </template> <!-- the js code to initialize the LiveSupport object --> |
