Support inline style attributes

2 files changed, 13 insertions, 17 deletions

diff --git a/src/html/dom.nim b/src/html/dom.nim
index 1aa6c191..4a63b2d0 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -62,7 +62,7 @@ type
 
     id*: string
     classList*: seq[string]
-    attributes*: Table[string, Attr]
+    attributes*: Table[string, string]
     cssvalues*: CSSComputedValues
     cssvalues_before*: CSSComputedValues
     cssvalues_after*: CSSComputedValues
@@ -104,7 +104,6 @@ type
   HTMLBRElement* = ref HTMLBRElementObj
   HTMLBRElementObj = object of HTMLElementObj
 
-
 func firstChild(node: Node): Node =
   if node.childNodes.len == 0:
     return nil
@@ -235,8 +234,5 @@ func newAttr*(parent: Element, key: string, value: string): Attr =
   result.name = key
   result.value = value
 
-func getAttrValue*(element: Element, s: string): string =
-  let attr = element.attributes.getOrDefault(s, nil)
-  if attr != nil:
-    return attr.value
-  return ""
+func attr*(element: Element, s: string): string =
+  return element.attributes.getOrDefault(s, "")
diff --git a/src/html/parser.nim b/src/html/parser.nim
index 0102fe17..a3a6885d 100644
--- a/src/html/parser.nim
+++ b/src/html/parser.nim
@@ -225,11 +225,11 @@ proc processDocumentStartElement(state: var HTMLParseState, element: Element, ta
   var add = true
 
   for k, v in tag.attrs:
-    element.attributes[k] = element.newAttr(k, v)
+    element.attributes[k] = v
   
-  element.id = element.getAttrValue("id")
+  element.id = element.attr("id")
   if element.attributes.hasKey("class"):
-    for w in unicode.split(element.attributes["class"].value, Rune(' ')):
+    for w in unicode.split(element.attributes["class"], Rune(' ')):
       element.classList.add(w)
 
   case element.tagType
@@ -240,16 +240,16 @@ proc processDocumentStartElement(state: var HTMLParseState, element: Element, ta
   of TAG_STYLE:
     state.in_style = true
   of TAG_SELECT:
-    HTMLSelectElement(element).name = element.getAttrValue("name")
-    HTMLSelectElement(element).value = element.getAttrValue("value")
+    HTMLSelectElement(element).name = element.attr("name")
+    HTMLSelectElement(element).value = element.attr("value")
   of TAG_INPUT:
-    HTMLInputElement(element).value = element.getAttrValue("value")
-    HTMLInputElement(element).itype = element.getAttrValue("type").inputType()
-    HTMLInputElement(element).size = element.getAttrValue("size").inputSize()
+    HTMLInputElement(element).value = element.attr("value")
+    HTMLInputElement(element).itype = element.attr("type").inputType()
+    HTMLInputElement(element).size = element.attr("size").inputSize()
   of TAG_A:
-    HTMLAnchorElement(element).href = element.getAttrValue("href")
+    HTMLAnchorElement(element).href = element.attr("href")
   of TAG_OPTION:
-    HTMLOptionElement(element).value = element.getAttrValue("href")
+    HTMLOptionElement(element).value = element.attr("href")
   of TAG_HTML:
     add = false
   of TAG_HEAD: