From 5041cc7a2c00fff6c450634ab6ea7e3abf12131b Mon Sep 17 00:00:00 2001 From: fadhlu Date: Fri, 19 Mar 2021 17:28:01 +0700 Subject: [PATCH] Remove unused var and fix button ui margin --- src/routes/calculator/_resin.svelte | 10 ++++------ src/routes/calculator/index.svelte | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/routes/calculator/_resin.svelte b/src/routes/calculator/_resin.svelte index bdac34f9..a0eb1e8f 100644 --- a/src/routes/calculator/_resin.svelte +++ b/src/routes/calculator/_resin.svelte @@ -7,14 +7,13 @@ import Input from '../../components/Input.svelte'; import { time } from '../../stores/time'; - let changed = false; + let changed = true; let currentResin = ''; let desiredResin = ''; let maxResin = 160; let millisecondsToWait; let fullTime = null; let missingResin = 160; - let showResult = false; let resinTypeOutput = ''; let resinOutput = ''; @@ -36,7 +35,7 @@ }; $: isCurrentResin = currentResin >= 0 && currentResin < 160 && currentResin !== ''; - $: isDesiredResin = desiredResin <= 160 && desiredResin >= 1 && desiredResin === ''; + $: isDesiredResin = desiredResin <= 160 && desiredResin >= 1 && desiredResin !== ''; $: canCalculate = isCurrentResin || isDesiredResin; function calculate() { @@ -44,12 +43,11 @@ resinOutput = resinTypeOutput === 'maxResin' ? missingResin : desiredResin; millisecondsToWait = resinTypeOutput === 'maxResin' ? missingResin * minutePerResin : desiredResin * minutePerResin; fullTime = new Date($time.getTime() + millisecondsToWait); - showResult = true; + changed = false; } function onChange(type) { changed = true; - showResult = false; resinTypeOutput = type; } @@ -89,7 +87,7 @@ - {#if showResult} + {#if !changed}
diff --git a/src/routes/calculator/index.svelte b/src/routes/calculator/index.svelte index 62645bc0..30c4a40e 100644 --- a/src/routes/calculator/index.svelte +++ b/src/routes/calculator/index.svelte @@ -92,7 +92,7 @@ {$t('calculator.goto')} {$t('calculator.titleWeapon')} -