Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Scan barcode" modal input (#7610)

Browse Source 
* Prevent browser shortcuts in barcode input field

* Add Alt & Control key input
This commit is contained in:
Tom Van Eyck 2024-07-10 12:03:49 +02:00 committed by GitHub
parent 7655113851
commit 8059fb1e05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/InvenTree/templates/js/translated/barcode.js
View File

@ -315,6 +315,34 @@ function barcodeDialog(title, options={}) {
var barcode = $(modal + ' #barcode');
// The control characters that are used in barcodes.
const controlKeys = {
"BracketRight": String.fromCharCode(29), // Group separator
"Digit6": String.fromCharCode(30), // Record separator
}
let altValue = 0;
barcode.keydown(function(event) {
if (event.ctrlKey) {
// Prevent most of the keyboard shortcuts.
// Not all of them will be blocked, browser don't allow this:
// https://stackoverflow.com/questions/59952382/using-preventdefault-to-override-opening-new-tab
event.preventDefault();
if (event.originalEvent.code in controlKeys) {
event.target.value += controlKeys[event.originalEvent.code];
}
}
else if (event.altKey && event.key != "Alt") {
let val = parseInt(event.key, 10);
if (Number.isNaN(val) || val < 0 || val > 9) {
altValue = 0;
return;
}
altValue *= 10;
altValue += val;
}
});
// Handle 'enter' key on barcode
barcode.keyup(function(event) {
event.preventDefault();
@ -322,6 +350,9 @@ function barcodeDialog(title, options={}) {
if (event.which == 10 || event.which == 13) {
clearTimeout(barcodeInputTimer);
sendBarcode();
} else if (event.key == "Alt" && altValue > 0) {
event.target.value += String.fromCharCode(altValue);
altValue = 0;
} else {
// Start a timer to automatically send barcode after input is complete
clearTimeout(barcodeInputTimer);