From 52d9d5d0853b16c20913963cf7f1d3a83e3f2c65 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 9 Feb 2020 17:55:53 +0100
Subject: Improve parsing functions

---
 src/main.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main.ts')

diff --git a/src/main.ts b/src/main.ts
index ad83591..184d26d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,12 +5,12 @@ import * as dom from './dom'
 
 const itemEntries =
   dom.nodeListToArray(document.querySelectorAll('.g-Recipe__Content ul > li'))
-    .map(itemNode => ({ tag: 'li', node: itemNode }))
+    .map(itemNode => ({ name: 'li', node: itemNode }))
 
 const h1 = document.querySelector<HTMLElement>('.g-Recipe__Content h1')
 
 if (h1 !== null) {
-  itemEntries.push({ tag: 'h1', node: h1 })
+  itemEntries.push({ name: 'h1', node: h1 })
 }
 
 const inputs = setupInputs(itemEntries)
@@ -20,7 +20,7 @@ inputs.map(input => {
     if (e.target !==null) {
       const parsed = number.parse((e.target as HTMLInputElement).value)
 
-      if (parsed !== undefined && parsed.before === '' && parsed.after === '') {
+      if (parsed !== undefined) {
         const factor = parsed.number / input.number
         inputs.map(input2 => {
           if (input.node !== input2.node) {
@@ -32,8 +32,8 @@ inputs.map(input => {
   }
 })
 
-interface InputEntry {
-  tag: string;
+interface InputTag {
+  name: string;
   node: HTMLElement;
 }
 
@@ -42,18 +42,18 @@ interface InputResult {
   node: HTMLInputElement
 }
 
-function setupInputs(xs: InputEntry[]): InputResult[] {
+function setupInputs(tags: InputTag[]): InputResult[] {
   const res: InputResult[] = []
 
-  xs.forEach(x => {
-    const parsed = number.parse(x.node.innerText)
+  tags.forEach(tag => {
+    const parsed = number.parseInsideText(tag.node.innerText)
 
     if (parsed !== undefined) {
-      const numberNode = number.node(x.tag, parsed)
-      dom.replace(x.node, numberNode.node)
+      const numberNode = number.node(tag.name, parsed)
+      dom.replace(tag.node, numberNode.node)
       res.push({
         number: parsed.number,
-        node: numberNode.number
+        node: numberNode.numberInput
       })
     }
   })
-- 
cgit v1.2.3