summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js/composer.js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2017-03-05 09:34:56 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commite5740270568404d71a3bc093074a085c9c2eded8 (patch)
tree7b84740d92c550236de25a37cf37d244760bdbf3 /addons/mail/static/src/js/composer.js
parent0df9968433389e0d504276cd711473c2eef937ae (diff)
[REF] web,*: remove 'web.model' and 'web.dataModel
Use this.rpc instead of Model object, with web.ajax if necessary. nb: EventDispatcherMixin include now the custom_events managment instead of widget
Diffstat (limited to 'addons/mail/static/src/js/composer.js')
-rw-r--r--addons/mail/static/src/js/composer.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index 4d471577922..b8a25cda7e3 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -7,7 +7,6 @@ var utils = require('mail.utils');
var core = require('web.core');
var data = require('web.data');
var dom = require('web.dom');
-var Model = require('web.Model');
var session = require('web.session');
var Widget = require('web.Widget');
@@ -417,9 +416,6 @@ var BasicComposer = Widget.extend(chat_mixin, {
// Emojis
this.emoji_container_classname = 'o_composer_emoji';
-
- this.PartnerModel = new Model('res.partner');
- this.ChannelModel = new Model('mail.channel');
},
start: function () {
@@ -665,18 +661,22 @@ var BasicComposer = Widget.extend(chat_mixin, {
// Mention
mention_fetch_throttled: function (model, method, kwargs) {
+ var self = this;
// Delays the execution of the RPC to prevent unnecessary RPCs when the user is still typing
var def = $.Deferred();
clearTimeout(this.mention_fetch_timer);
this.mention_fetch_timer = setTimeout(function () {
- return model.call(method, kwargs).then(function (results) {
- def.resolve(results);
- });
+ return self.rpc(model, method)
+ .kwargs(kwargs)
+ .exec()
+ .then(function (results) {
+ def.resolve(results);
+ });
}, 200);
return def;
},
mention_fetch_channels: function (search) {
- return this.mention_fetch_throttled(this.ChannelModel, 'get_mention_suggestions', {
+ return this.mention_fetch_throttled('mail.channel', 'get_mention_suggestions', {
limit: this.options.mention_fetch_limit,
search: search,
}).then(function (suggestions) {
@@ -706,7 +706,7 @@ var BasicComposer = Widget.extend(chat_mixin, {
});
if (!suggestions.length && !self.options.mention_partners_restricted) {
// no result found among prefetched partners, fetch other suggestions
- suggestions = self.mention_fetch_throttled(self.PartnerModel, 'get_mention_suggestions', {
+ suggestions = mention_fetch_throttled('res.partner', 'get_mention_suggestions', {
limit: limit,
search: search,
});