mirror of
				https://github.com/grocy/grocy.git
				synced 2025-10-31 10:46:36 +00:00 
			
		
		
		
	Use Quagga2 instead of QuaggaJS (closes #579)
This commit is contained in:
		| @@ -41,7 +41,8 @@ | ||||
| ### General & other improvements/fixes | ||||
| - Optimized that sometimes the corresponding form was not validated when selecting a date from the datetimepicker | ||||
| - New `config.php` setting `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD` which activates the number pad for best-before-date fields on (supported) mobile browsers (useful because of [shorthands](https://github.com/grocy/grocy#input-shorthands-for-date-fields)) (defaults to `true`) (thanks @Mik-) | ||||
| - Enhancements for the camera barcode scanner (thanks @Mik-) | ||||
| - Enhancements for the camera barcode scanner (thanks @Mik- for the work on improving the torch capabilities) | ||||
|   - Replaced [QuaggaJS](https://github.com/serratus/quaggaJS) (seems to be unmaintained) by [Quagga2](https://github.com/ericblade/quagga2) | ||||
|   - The light button only displayed when the device has a flash light | ||||
|   - New `config.php` setting `FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA` to always enable the flash light automatically | ||||
|   - Various display/CSS improvements | ||||
|   | ||||
| @@ -3,6 +3,7 @@ | ||||
| 	"private": true, | ||||
| 	"dependencies": { | ||||
| 		"@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master", | ||||
| 		"@ericblade/quagga2": "^0.0.19", | ||||
| 		"@fortawesome/fontawesome-free": "^5.12.1", | ||||
| 		"TagManager": "https://github.com/max-favilli/tagmanager.git#master", | ||||
| 		"animate.css": "^3.7.2", | ||||
| @@ -27,7 +28,6 @@ | ||||
| 		"jquery-serializejson": "^2.9.0", | ||||
| 		"moment": "^2.24.0", | ||||
| 		"nosleep.js": "^0.9.0", | ||||
| 		"quagga": "^0.12.1", | ||||
| 		"sprintf-js": "^1.1.2", | ||||
| 		"startbootstrap-sb-admin": "4.0.0", | ||||
| 		"summernote": "^0.8.12", | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
| @endpush | ||||
|  | ||||
| @push('pageScripts') | ||||
| 	<script src="{{ $U('/node_modules/quagga/dist/quagga.min.js?v=', true) }}{{ $version }}"></script> | ||||
| 	<script src="{{ $U('/node_modules/@ericblade/quagga2/dist/quagga.min.js?v=', true) }}{{ $version }}"></script> | ||||
| @endpush | ||||
|  | ||||
| @push('pageStyles') | ||||
|   | ||||
		Reference in New Issue
	
	Block a user