From 067ae915b7dc4a5e60e61fd92f9675a45f576f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20K=C3=BChn?= Date: Wed, 4 Jul 2018 13:33:14 +0200 Subject: [PATCH] [REF] im_livechat,mail: renamed "livechat" to "website livechat" Renamed "livechat" model into "website livechat", in order to avoid confusion with backend livechat. - `im_livechat.model.LivechatMessage` becomes `im_livechat.model.WebsiteLivechatMessage` - `im_livechat.LivechatWindow` becomes `im_livechat.WebsiteLivechatWindow` --- addons/im_livechat/static/src/js/im_livechat.js | 8 ++++---- .../{livechat_message.js => website_livechat_message.js} | 6 +++--- .../js/{livechat_window.js => website_livechat_window.js} | 2 +- .../im_livechat/views/im_livechat_channel_templates.xml | 4 ++-- .../src/js/thread_windows/abstract_thread_window.js | 5 +++-- addons/website_livechat/views/website_livechat.xml | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) rename addons/im_livechat/static/src/js/models/{livechat_message.js => website_livechat_message.js} (91%) rename addons/im_livechat/static/src/js/{livechat_window.js => website_livechat_window.js} (97%) diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js index 3334763331d..acc1ed8e559 100644 --- a/addons/im_livechat/static/src/js/im_livechat.js +++ b/addons/im_livechat/static/src/js/im_livechat.js @@ -10,8 +10,8 @@ var time = require('web.time'); var utils = require('web.utils'); var Widget = require('web.Widget'); -var LivechatMessage = require('im_livechat.model.LivechatMessage'); -var LivechatWindow = require('im_livechat.LivechatWindow'); +var WebsiteLivechatMessage = require('im_livechat.model.WebsiteLivechatMessage'); +var WebsiteLivechatWindow = require('im_livechat.WebsiteLivechatWindow'); var _t = core._t; var QWeb = core.qweb; @@ -111,7 +111,7 @@ var LivechatButton = Widget.extend({ options = _.extend({}, options, { serverURL: this._serverURL, }); - var message = new LivechatMessage(this, data, options); + var message = new WebsiteLivechatMessage(this, data, options); if (options && options.prepend) { this._messages.unshift(message); @@ -225,7 +225,7 @@ var LivechatButton = Widget.extend({ displayStars: false, placeholder: this.options.input_placeholder || "", }; - this._chatWindow = new LivechatWindow(this, channel, options); + this._chatWindow = new WebsiteLivechatWindow(this, channel, options); this._chatWindow.appendTo($('body')).then(function () { self._chatWindow.$el.css({right: 0, bottom: 0}); self.$el.hide(); diff --git a/addons/im_livechat/static/src/js/models/livechat_message.js b/addons/im_livechat/static/src/js/models/website_livechat_message.js similarity index 91% rename from addons/im_livechat/static/src/js/models/livechat_message.js rename to addons/im_livechat/static/src/js/models/website_livechat_message.js index 04504aea4ff..cc03123952e 100644 --- a/addons/im_livechat/static/src/js/models/livechat_message.js +++ b/addons/im_livechat/static/src/js/models/website_livechat_message.js @@ -1,4 +1,4 @@ -odoo.define('im_livechat.model.LivechatMessage', function (require) { +odoo.define('im_livechat.model.WebsiteLivechatMessage', function (require) { "use strict"; var AbstractMessage = require('mail.model.AbstractMessage'); @@ -10,7 +10,7 @@ var AbstractMessage = require('mail.model.AbstractMessage'); * * @see mail.model.AbstractMessage for more information. */ -var LivechatMessage = AbstractMessage.extend({ +var WebsiteLivechatMessage = AbstractMessage.extend({ /** * @param {Widget} parent @@ -60,6 +60,6 @@ var LivechatMessage = AbstractMessage.extend({ }); -return LivechatMessage; +return WebsiteLivechatMessage; }); diff --git a/addons/im_livechat/static/src/js/livechat_window.js b/addons/im_livechat/static/src/js/website_livechat_window.js similarity index 97% rename from addons/im_livechat/static/src/js/livechat_window.js rename to addons/im_livechat/static/src/js/website_livechat_window.js index 7e526f762b8..77eaf40b99b 100644 --- a/addons/im_livechat/static/src/js/livechat_window.js +++ b/addons/im_livechat/static/src/js/website_livechat_window.js @@ -1,4 +1,4 @@ -odoo.define('im_livechat.LivechatWindow', function (require) { +odoo.define('im_livechat.WebsiteLivechatWindow', function (require) { "use strict"; var AbstractThreadWindow = require('mail.AbstractThreadWindow'); diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index 4c2b5b37582..7c2c3586d2e 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -137,7 +137,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/addons/mail/static/src/js/thread_windows/abstract_thread_window.js b/addons/mail/static/src/js/thread_windows/abstract_thread_window.js index 2849089a9f4..ae756b6f624 100644 --- a/addons/mail/static/src/js/thread_windows/abstract_thread_window.js +++ b/addons/mail/static/src/js/thread_windows/abstract_thread_window.js @@ -17,11 +17,12 @@ var HEIGHT_FOLDED = '34px'; * This is an abstract widget for rendering thread windows. * * It contains logic that are shared between mail.ThreadWindow and - * mail.LivechatWindow. + * im_livechat.WebsiteLivechatWindow. * * The reason for having two different implementation of thread windows is * that mail.ThreadWindow makes use of mail.Manager, which is used in the - * backend, while mail.LivechatWindow must work without this mail service. + * backend, while im_livechat.WebsiteLivechatWindow must work without this + * mail service. */ var AbstractThreadWindow = Widget.extend({ template: 'mail.AbstractThreadWindow', diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml index 32dd7972188..36dae3be74f 100644 --- a/addons/website_livechat/views/website_livechat.xml +++ b/addons/website_livechat/views/website_livechat.xml @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - +