From f588b3ef48d700eef3f99fb2fe0f0a71e7679bae Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 25 Apr 2023 07:09:32 +0200 Subject: [PATCH] Share/Pool size calculation: show and allow percentage values --- plugins/dynamix/DeviceInfo.page | 4 ++-- plugins/dynamix/ShareEdit.page | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index 0cce19025..4c4977a99 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -131,11 +131,11 @@ function setFloor() { var unit = size.replace(/[0-9.,\s]/g,''); if (unit=='%') { number = (number > 0 && number <= 100) ? parseInt(full * number / 100) : ''; - $('#shareFloor').val(isNaN(number) ? '' : number); + $('#shareFloor').val(isNaN(number) ? val : number); } else { var base = unit.length==2 ? 1000 : (unit.length==1 ? 1024 : 0); number = base>0 ? size.replace(unit,'') * Math.pow(base,(units.indexOf(unit.toUpperCase().replace('B',''))||0)) : size; - $('#shareFloor').val(isNaN(number) ? '' : number); + $('#shareFloor').val(isNaN(number) ? val : number); } } } diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index 9bf3a6b93..f515819e2 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -480,11 +480,11 @@ function setFloor(val) { var unit = size.replace(/[0-9.,\s]/g,''); if (unit=='%') { number = (number > 0 && number <= 100) ? parseInt(full * number / 100) : ''; - return isNaN(number) ? '' : number; + return isNaN(number) ? val : number; } else { var base = unit.length==2 ? 1000 : (unit.length==1 ? 1024 : 0); number = base>0 ? size.replace(unit,'') * Math.pow(base,(units.indexOf(unit.toUpperCase().replace('B',''))||0)) : size; - return isNaN(number) ? '' : number; + return isNaN(number) ? val : number; } } // Compose input fields