Skip to content

Commit 3394930

Browse files
authored
Merge pull request #258 from HapticX/dev
fix rendering system
2 parents 8200980 + 0b245d2 commit 3394930

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/happyx/spa/components.nim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,24 @@ template reRenderTmpl*() =
100100
var
101101
current = document.querySelector("[data-" & self.uniqCompId & "]")
102102
elements = newSeq[Element]()
103-
for tag in compTmpData.children:
103+
for tag in compTmpData.childNodes:
104104
if not current.isNil:
105105
elements.add(current)
106106
current = current.nextSibling.Element
107107
# echo elements.len
108108
for i in countdown(elements.len-1, 0, 1):
109109
let
110110
elem = elements[i]
111-
tag = compTmpData.children[i]
111+
tag = compTmpData.childNodes[i]
112112
parent = elem.parentElement
113113
idx = index(elem)
114-
length = parent.children.len
114+
length = parent.childNodes.len
115115
# echo idx, ", ", length
116116
elem.remove()
117117
if length-1 == idx:
118118
parent.appendChild(tag)
119119
else:
120-
parent.insertBefore(tag, parent.children[idx])
120+
parent.insertBefore(tag, parent.childNodes[idx])
121121
if activeElement.hasAttribute("id"):
122122
let actElem = document.getElementById(activeElement.id)
123123
if not actElem.isNil:

src/happyx/spa/tag.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ proc addArgIter*(self: TagRef, arg: string) =
344344
##
345345
## See also `addArg function #addArg,TagRef,string`_
346346
when defined(js):
347-
if self.attributes.len == 0:
348-
self.setAttribute(cstring(arg), "")
347+
self.setAttribute(cstring(arg), "")
349348
else:
350349
if self.args.len == 0:
351350
self.args.add(arg)

0 commit comments

Comments
 (0)