diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-14 18:17:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-14 18:17:30 +0200 |
| commit | 1fca5e01cbfa0366725b448641d6cd86daa0a23a (patch) | |
| tree | 4c2e7727125f05f155a52e97c25aba5635f412e3 /addons/barcodes/static/src/js | |
| parent | 6d3cf9c6495ae328aa084b6ede16eff2b3c7a7fd (diff) | |
| parent | 156dee2aec409894d3f638d6b9218bd0a90bd6c7 (diff) | |
[MERGE] forward port branch saas-10 up to 156dee2
Diffstat (limited to 'addons/barcodes/static/src/js')
| -rw-r--r-- | addons/barcodes/static/src/js/barcode_events.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js index 546faee3655..fca30916106 100644 --- a/addons/barcodes/static/src/js/barcode_events.js +++ b/addons/barcodes/static/src/js/barcode_events.js @@ -129,6 +129,10 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, { // Don't catch keypresses which could have a UX purpose (like shortcuts) if (e.ctrlKey || e.metaKey || e.altKey) return; + // Don't catch Return when nothing is buffered. This way users + // can still use Return to 'click' on focused buttons or links. + if (e.which === 13 && this.buffered_key_events.length === 0) + return; // Don't catch events targeting elements that are editable because we // have no way of redispatching 'genuine' key events. Resent events // don't trigger native event handlers of elements. So this means that |