We don't need that switch-button, a native Boostrap button is enough and less disturbing

This commit is contained in:
Bernd Bestel
2020-02-03 21:21:42 +01:00
parent 58cff18b03
commit 171d6af5e1
7 changed files with 36 additions and 26 deletions

View File

@@ -521,10 +521,6 @@ if (GetUriParam("embedded") !== undefined)
// Default input field
Grocy.Components.ProductPicker.GetInputElement().focus();
// Can only be set via JS however...
$("#scan-mode").addClass("user-setting-control");
$("#scan-mode").attr("data-setting-key", "scan_mode_consume_enabled");
$(document).on("change", "#scan-mode", function(e)
{
if ($(this).prop("checked"))
@@ -532,3 +528,18 @@ $(document).on("change", "#scan-mode", function(e)
Grocy.UISound.AskForPermission();
}
});
$("#scan-mode-button").on("click", function(e)
{
document.activeElement.blur();
$("#scan-mode").click();
$("#scan-mode-button").toggleClass("btn-success").toggleClass("btn-danger");
if ($("#scan-mode").prop("checked"))
{
$("#scan-mode-status").text(__t("on"));
}
else
{
$("#scan-mode-status").text(__t("off"));
}
});

View File

@@ -362,14 +362,25 @@ function UndoStockTransaction(transactionId)
);
};
// Can only be set via JS however...
$("#scan-mode").addClass("user-setting-control");
$("#scan-mode").attr("data-setting-key", "scan_mode_purchase_enabled");
$(document).on("change", "#scan-mode", function(e)
$("#scan-mode").on("change", function(e)
{
if ($(this).prop("checked"))
{
Grocy.UISound.AskForPermission();
}
});
$("#scan-mode-button").on("click", function(e)
{
document.activeElement.blur();
$("#scan-mode").click();
$("#scan-mode-button").toggleClass("btn-success").toggleClass("btn-danger");
if ($("#scan-mode").prop("checked"))
{
$("#scan-mode-status").text(__t("on"));
}
else
{
$("#scan-mode-status").text(__t("off"));
}
});