summaryrefslogtreecommitdiff
path: root/addons/barcodes/static/src/js/barcode_field.js
diff options
context:
space:
mode:
authorVincent Schippefilt <vsc@odoo.com>2019-03-06 14:01:56 +0100
committerAaron Bohy <aab@odoo.com>2019-03-06 20:07:17 +0100
commit0ab6a629978f2ce07cf9f03696a941a85da3f684 (patch)
tree26f65ebf4f24776aa99c0afa7556a61e2abf6191 /addons/barcodes/static/src/js/barcode_field.js
parentd5a1ff3f64ec3a5f446f5ae5283526e32c3fc413 (diff)
[REF] barcodes: adapt code after jQuery update
Part of task 1896658 Co-authored-by: Aaron Bohy <aab@odoo.com> Co-authored-by: Christophe Matthieu <chm@odoo.com> Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com> Co-authored-by: David Monjoie <dmo@odoo.com> Co-authored-by: Martin Geubelle <mge@odoo.com> Co-authored-by: svs-odoo <svs@odoo.com> Co-authored-by: Vincent Schippefilt <vsc@odoo.com>
Diffstat (limited to 'addons/barcodes/static/src/js/barcode_field.js')
-rw-r--r--addons/barcodes/static/src/js/barcode_field.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js
index d8a7a1c853e..b5786f8a161 100644
--- a/addons/barcodes/static/src/js/barcode_field.js
+++ b/addons/barcodes/static/src/js/barcode_field.js
@@ -13,7 +13,7 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
// The barcode_events component intercepts keypresses and releases them when it
// appears they are not part of a barcode. But since released keypresses don't
// trigger native behaviour (like characters input), we must simulate it.
- 'keypress': '_onKeypress',
+ keypress: '_onKeypress',
}),
//--------------------------------------------------------------------------
@@ -24,9 +24,9 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
* @override
* @private
*/
- _renderEdit: function() {
+ _renderEdit: function () {
var self = this;
- $.when(this._super()).then(function () {
+ return Promise.resolve(this._super()).then(function () {
self.$input.data('enableBarcode', true);
});
},