github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 13:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove toggling of torch, as it's not working

Browse Source 
and add resize of video to fit in viewport hieght
This commit is contained in:
Michael Neuendorf 2020-03-29 13:05:13 +02:00
parent 0f2f6a7194
commit 885c294443
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/grocy.css
View File

@ -260,8 +260,15 @@ input::-webkit-inner-spin-button {
} }
/* Barcodescanner Quagga */ /* Barcodescanner Quagga */
#barcodescanner-container {
max-height: 90vw;
}
#livestream-container {
max-height: 100%;
}
#barcodescanner-livestream video { #barcodescanner-livestream video {
width: 100%; width: 100%;
} }
#barcodescanner-livestream canvas { #barcodescanner-livestream canvas {
width: 100%; width: 100%;

25
public/viewjs/components/barcodescanner.js
View File

@ -11,12 +11,26 @@ Grocy.Components.BarcodeScanner.CheckCapabilities = function()
var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch
var node = document.querySelector('.torch'); var node = document.querySelector('.torch');
if (node) { if (node) {
node.style.display = canTorch ? 'block' : 'none'; node.style.display = canTorch ? 'inline-block' : 'none';
}
// Reduce the height of the video, if it's heigher than then the viewport
var bc = document.getElementById('barcodescanner-container');
if (bc) {
var bcAspectRatio = bc.offsetWidth / bc.offsetHeight;
var settings = track.getSettings();
if (bcAspectRatio > settings.aspectRatio) {
var v = document.querySelector('#barcodescanner-livestream video')
if (v) {
var c = document.querySelector('#barcodescanner-livestream canvas')
var newWidth = v.clientWidth / bcAspectRatio * settings.aspectRatio + 'px';
v.style.width = newWidth;
c.style.width = newWidth;
}
}
} }
} }
Grocy.Components.BarcodeScanner.TorchState = false;
Grocy.Components.BarcodeScanner.StartScanning = function() Grocy.Components.BarcodeScanner.StartScanning = function()
{ {
Grocy.Components.BarcodeScanner.DecodedCodesCount = 0; Grocy.Components.BarcodeScanner.DecodedCodesCount = 0;
@ -28,8 +42,6 @@ Grocy.Components.BarcodeScanner.StartScanning = function()
type: "LiveStream", type: "LiveStream",
target: document.querySelector("#barcodescanner-livestream"), target: document.querySelector("#barcodescanner-livestream"),
constraints: { constraints: {
// width: 436,
// height: 327,
facingMode: "environment" facingMode: "environment"
} }
}, },
@ -180,11 +192,10 @@ $(document).on("click", "#barcodescanner-start-button", function(e)
className: 'btn-warning responsive-button torch', className: 'btn-warning responsive-button torch',
callback: function() callback: function()
{ {
Grocy.Components.BarcodeScanner.TorchState = !Grocy.Components.BarcodeScanner.TorchState;
Quagga.CameraAccess.getActiveTrack().applyConstraints({ Quagga.CameraAccess.getActiveTrack().applyConstraints({
advanced: [ advanced: [
{ {
torch: Grocy.Components.BarcodeScanner.TorchState torch: true
} }
] ]
}); });