diff options
| author | Géry Debongnie <ged@odoo.com> | 2017-03-07 14:23:44 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | 6cc324513ed88dd6f11aed642c08e6cf8b9fd0af (patch) | |
| tree | ad64ef8281e916a11ed7e38721d6ee16f9a8bd2a | |
| parent | aa5700bb7c1ad353ce130484969dff9648fe5857 (diff) | |
[REF] *: remove mixins from web.core
It is better to directly import web.mixins
| -rw-r--r-- | addons/barcodes/static/src/js/barcode_events.js | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/devices.js | 5 | ||||
| -rw-r--r-- | addons/pos_restaurant/static/src/js/multiprint.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/core/session.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/core/widget.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/services/core.js | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js index 0adff5f8e1b..da0074fb5c7 100644 --- a/addons/barcodes/static/src/js/barcode_events.js +++ b/addons/barcodes/static/src/js/barcode_events.js @@ -2,7 +2,7 @@ odoo.define('barcodes.BarcodeEvents', function(require) { "use strict"; var core = require('web.core'); -var mixins = core.mixins; +var mixins = require('web.mixins'); // For IE >= 9, use this, new CustomEvent(), instead of new Event() diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 9e6846e89cc..0a40a495a3c 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -3,6 +3,7 @@ odoo.define('point_of_sale.devices', function (require) { var ajax = require('web.ajax'); var core = require('web.core'); +var mixins = require('web.mixins'); var rpc = require('web.rpc'); var Session = require('web.Session'); @@ -90,9 +91,9 @@ var JobQueue = function(){ // connected to the Point of Sale. As the communication only goes from the POS to the proxy, // methods are used both to signal an event, and to fetch information. -var ProxyDevice = core.Class.extend(core.mixins.PropertiesMixin,{ +var ProxyDevice = core.Class.extend(mixins.PropertiesMixin,{ init: function(parent,options){ - core.mixins.PropertiesMixin.init.call(this,parent); + mixins.PropertiesMixin.init.call(this,parent); var self = this; options = options || {}; diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js index 8dc63ea07fc..3f2d482c1e9 100644 --- a/addons/pos_restaurant/static/src/js/multiprint.js +++ b/addons/pos_restaurant/static/src/js/multiprint.js @@ -4,10 +4,10 @@ odoo.define('pos_restaurant.multiprint', function (require) { var models = require('point_of_sale.models'); var screens = require('point_of_sale.screens'); var core = require('web.core'); +var mixins = require('web.mixins'); var Session = require('web.Session'); var QWeb = core.qweb; -var mixins = core.mixins; var Printer = core.Class.extend(mixins.PropertiesMixin,{ init: function(parent,options){ diff --git a/addons/web/static/src/js/core/session.js b/addons/web/static/src/js/core/session.js index 9ee5726cfc8..6cc5529e34f 100644 --- a/addons/web/static/src/js/core/session.js +++ b/addons/web/static/src/js/core/session.js @@ -4,11 +4,11 @@ odoo.define('web.Session', function (require) { var ajax = require('web.ajax'); var concurrency = require('web.concurrency'); var core = require('web.core'); +var mixins = require('web.mixins'); var utils = require('web.utils'); var _t = core._t; var qweb = core.qweb; -var mixins = core.mixins; // To do: refactor session. Session accomplishes several concerns (rpc, // configuration, currencies (wtf?), user permissions...). They should be diff --git a/addons/web/static/src/js/core/widget.js b/addons/web/static/src/js/core/widget.js index 84a7c48c20e..b76c8d7e8bc 100644 --- a/addons/web/static/src/js/core/widget.js +++ b/addons/web/static/src/js/core/widget.js @@ -2,8 +2,7 @@ odoo.define('web.Widget', function (require) { "use strict"; var core = require('web.core'); - -var mixins = core.mixins; +var mixins = require('web.mixins'); /** * Base class for all visual components. Provides a lot of functionalities helpful diff --git a/addons/web/static/src/js/services/core.js b/addons/web/static/src/js/services/core.js index acd22c09fa1..0a52da1c521 100644 --- a/addons/web/static/src/js/services/core.js +++ b/addons/web/static/src/js/services/core.js @@ -3,7 +3,6 @@ odoo.define('web.core', function (require) { var Bus = require('web.Bus'); var Class = require('web.Class'); -var mixins = require('web.mixins'); var QWeb = require('web.QWeb'); var Registry = require('web.Registry'); var translation = require('web.translation'); @@ -29,7 +28,6 @@ return { // core classes and functions Class: Class, - mixins: mixins, bus: bus, main_bus: new Bus(), _t: translation._t, |
