diff --git a/examples/mediaplayer/mediaplayer.nim b/examples/mediaplayer/mediaplayer.nim index 18179c1..890c078 100644 --- a/examples/mediaplayer/mediaplayer.nim +++ b/examples/mediaplayer/mediaplayer.nim @@ -1,5 +1,5 @@ -import karax, karaxdsl, vdom, dom, components +import karax, karaxdsl, vdom, kdom, components const Play = 0 diff --git a/examples/scrollapp/scrollapp.nim b/examples/scrollapp/scrollapp.nim index e5ef9c1..8ead611 100644 --- a/examples/scrollapp/scrollapp.nim +++ b/examples/scrollapp/scrollapp.nim @@ -1,7 +1,7 @@ ## Example that shows how to accomplish an "infinitely scrolling" app. include karaxprelude -import jstrutils, dom +import jstrutils, kdom, vstyles var entries: seq[cstring] = @[] for i in 1..500: @@ -16,7 +16,8 @@ proc scrollEvent(ev: Event; n: VNode) = proc createDom(): VNode = result = buildHtml(): - tdiv(onscroll=scrollEvent, style="height: 400px; overflow: scroll"): + tdiv(onscroll=scrollEvent, style=style( + (StyleAttr.height, cstring"400px"), (StyleAttr.overflow, cstring"scroll"))): for x in entries: tdiv: text x diff --git a/experiments/ajaxtest.nim b/experiments/ajaxtest.nim index 7af60cd..720b6b2 100644 --- a/experiments/ajaxtest.nim +++ b/experiments/ajaxtest.nim @@ -1,4 +1,4 @@ -import dom, kajax +import kdom, kajax proc cb(httpStatus: int, response: cstring) = echo "Worked!" diff --git a/experiments/example.nim b/experiments/example.nim index caa7285..fd1e208 100644 --- a/experiments/example.nim +++ b/experiments/example.nim @@ -1,5 +1,5 @@ -import vdom, vstyles, components, karax, karaxdsl, jdict, jstrutils, dom +import vdom, vstyles, components, karax, karaxdsl, jdict, jstrutils, kdom var images: seq[cstring] = @[cstring"a", "b", "c", "d"] diff --git a/src/components.nim b/src/components.nim index 7fcc707..555de77 100644 --- a/src/components.nim +++ b/src/components.nim @@ -1,6 +1,6 @@ ## Components in Karax are built by the ``.component`` macro annotation. -import macros, jdict, dom, vdom, tables, strutils +import macros, jdict, kdom, vdom, tables, strutils type StateDict*[V] = ref object diff --git a/src/karax.nim b/src/karax.nim index 2ac4e91..3915b7f 100644 --- a/src/karax.nim +++ b/src/karax.nim @@ -1,8 +1,8 @@ ## Karax -- Single page applications for Nim. -import dom, vdom, jstrutils, components, jdict, vstyles +import kdom, vdom, jstrutils, components, jdict, vstyles -export dom.Event +export kdom.Event proc kout*[T](x: T) {.importc: "console.log", varargs.} ## the preferred way of debugging karax applications. diff --git a/src/dom.nim b/src/kdom.nim similarity index 100% rename from src/dom.nim rename to src/kdom.nim diff --git a/src/vdom.nim b/src/vdom.nim index 9d2b90d..a10dce6 100644 --- a/src/vdom.nim +++ b/src/vdom.nim @@ -1,6 +1,6 @@ ## Virtual DOM implementation for Karax. -from dom import Event, Node +from kdom import Event, Node import shash, macros, vstyles from strutils import toUpperAscii diff --git a/src/vstyles.nim b/src/vstyles.nim index 022476e..f3d8dbc 100644 --- a/src/vstyles.nim +++ b/src/vstyles.nim @@ -1,5 +1,5 @@ -import dom, macros +import kdom, macros type StyleAttr* {.pure.} = enum ## the style attributes supported by the virtual DOM. diff --git a/tests/diffDomTests.nim b/tests/diffDomTests.nim index 7fdcf85..d2c09ab 100644 --- a/tests/diffDomTests.nim +++ b/tests/diffDomTests.nim @@ -1,5 +1,5 @@ -import dom, vdom, times, karax, karaxdsl, jdict, jstrutils, parseutils, sequtils +import kdom, vdom, times, karax, karaxdsl, jdict, jstrutils, parseutils, sequtils var entries: seq[cstring]