[IMP] pre-commit run after update

Includes some manual fixes to silent ESLint warnings.
This commit is contained in:
Jairo Llopis
2020-01-24 13:45:39 +00:00
committed by David
parent 71b24af712
commit 94462b5c72
5 changed files with 105 additions and 83 deletions

View File

@@ -1,24 +1,22 @@
odoo.define('web_notify.WebClient', function (require) {
odoo.define("web_notify.WebClient", function(require) {
"use strict";
var WebClient = require('web.WebClient');
var base_bus = require('bus.Longpolling');
var session = require('web.session');
require('bus.BusService');
var WebClient = require("web.WebClient");
var session = require("web.session");
require("bus.BusService");
WebClient.include({
show_application: function () {
show_application: function() {
var res = this._super();
this.start_polling();
return res;
},
start_polling: function () {
this.channel_success = 'notify_success_' + session.uid;
this.channel_danger = 'notify_danger_' + session.uid;
this.channel_warning = 'notify_warning_' + session.uid;
this.channel_info = 'notify_info_' + session.uid;
this.channel_default = 'notify_default_' + session.uid;
start_polling: function() {
this.channel_success = "notify_success_" + session.uid;
this.channel_danger = "notify_danger_" + session.uid;
this.channel_warning = "notify_warning_" + session.uid;
this.channel_info = "notify_info_" + session.uid;
this.channel_default = "notify_default_" + session.uid;
this.all_channels = [
this.channel_success,
this.channel_danger,
@@ -26,40 +24,35 @@ odoo.define('web_notify.WebClient', function (require) {
this.channel_info,
this.channel_default,
];
this.call('bus_service', 'addChannel', this.channel_success);
this.call('bus_service', 'addChannel', this.channel_danger);
this.call('bus_service', 'addChannel', this.channel_warning);
this.call('bus_service', 'addChannel', this.channel_info);
this.call('bus_service', 'addChannel', this.channel_default);
this.call(
'bus_service', 'on', 'notification',
this, this.bus_notification);
this.call('bus_service', 'startPolling');
this.call("bus_service", "addChannel", this.channel_success);
this.call("bus_service", "addChannel", this.channel_danger);
this.call("bus_service", "addChannel", this.channel_warning);
this.call("bus_service", "addChannel", this.channel_info);
this.call("bus_service", "addChannel", this.channel_default);
this.call("bus_service", "on", "notification", this, this.bus_notification);
this.call("bus_service", "startPolling");
},
bus_notification: function (notifications) {
bus_notification: function(notifications) {
var self = this;
_.each(notifications, function (notification) {
_.each(notifications, function(notification) {
var channel = notification[0];
var message = notification[1];
if (
self.all_channels != null &&
self.all_channels !== null &&
self.all_channels.indexOf(channel) > -1
) {
self.on_message(message);
}
});
},
on_message: function (message) {
return this.call(
'notification', 'notify', {
type: message.type,
title: message.title,
message: message.message,
sticky: message.sticky,
className: message.className,
}
);
on_message: function(message) {
return this.call("notification", "notify", {
type: message.type,
title: message.title,
message: message.message,
sticky: message.sticky,
className: message.className,
});
},
});
});

View File

@@ -1,26 +1,26 @@
odoo.define('web_notify.Notification', function (require) {
odoo.define("web_notify.Notification", function(require) {
"use strict";
var Notification = require('web.Notification');
var Notification = require("web.Notification");
Notification.include({
icon_mapping: {
'success': 'fa-thumbs-up',
'danger': 'fa-exclamation-triangle',
'warning': 'fa-exclamation',
'info': 'fa-info',
'default': 'fa-lightbulb-o',
success: "fa-thumbs-up",
danger: "fa-exclamation-triangle",
warning: "fa-exclamation",
info: "fa-info",
default: "fa-lightbulb-o",
},
init: function () {
init: function() {
this._super.apply(this, arguments);
// Delete default classes
this.className = this.className.replace(' o_error', '');
this.className = this.className.replace(" o_error", "");
// Add custom icon and custom class
this.icon = (this.type in this.icon_mapping) ?
this.icon_mapping[this.type] :
this.icon_mapping['default'];
this.className += ' o_' + this.type;
this.icon =
this.type in this.icon_mapping
? this.icon_mapping[this.type]
: this.icon_mapping.default;
this.className += " o_" + this.type;
},
});
});