[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`
This commit is contained in:
@@ -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();
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
});
|
||||
+1
-1
@@ -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');
|
||||
@@ -137,7 +137,7 @@
|
||||
<!-- Bus, Mail, Livechat -->
|
||||
<!-- thread windows -->
|
||||
<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/livechat_window.js"></script>
|
||||
<script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
|
||||
<script type="text/javascript" src="/bus/static/src/js/bus.js"></script>
|
||||
<script type="text/javascript" src="/mail/static/src/js/thread.js"></script>
|
||||
<script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
|
||||
@@ -146,7 +146,7 @@
|
||||
<!-- Models -->
|
||||
<!-- 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/livechat_message.js"></script>
|
||||
<script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat_message.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>
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<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/livechat_window.js"></script>
|
||||
<script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
|
||||
<script type="text/javascript" src="/bus/static/src/js/bus.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.js"></script>
|
||||
@@ -19,7 +19,7 @@
|
||||
<!-- Models -->
|
||||
<!-- 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/livechat_message.js"></script>
|
||||
<script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat_message.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"/>
|
||||
|
||||
Reference in New Issue
Block a user