Get rid of casts
This commit is contained in:
parent
42985fd2bc
commit
85ea229f7f
9 changed files with 20 additions and 11 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import sugar, httpcore, options, json, strutils, algorithm
|
import sugar, httpcore, options, json, strutils, algorithm
|
||||||
import dom except Event
|
import dom except Event
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax / [kajax, kdom, vstyles, vdom]
|
import karax / [kajax, kdom, vstyles, vdom]
|
||||||
|
|
@ -108,7 +109,7 @@ when defined(js):
|
||||||
let form = dom.document.getElementById("add-category-form")
|
let form = dom.document.getElementById("add-category-form")
|
||||||
let formData = newFormData(form)
|
let formData = newFormData(form)
|
||||||
|
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onAddCategoryPost(s, r, state))
|
(s: int, r: kstring) => onAddCategoryPost(s, r, state))
|
||||||
|
|
||||||
proc onClose(ev: Event, n: VNode, state: CategoryPicker) =
|
proc onClose(ev: Event, n: VNode, state: CategoryPicker) =
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import sugar, httpcore, options, json
|
import sugar, httpcore, options, json
|
||||||
import dom except Event
|
import dom except Event
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax / [kajax, kdom]
|
import karax / [kajax, kdom]
|
||||||
|
|
@ -59,7 +60,7 @@ when defined(js):
|
||||||
formData.append("id", $state.post.id)
|
formData.append("id", $state.post.id)
|
||||||
of DeleteThread:
|
of DeleteThread:
|
||||||
formData.append("id", $state.thread.id)
|
formData.append("id", $state.thread.id)
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onDeletePost(s, r, state))
|
(s: int, r: kstring) => onDeletePost(s, r, state))
|
||||||
|
|
||||||
proc onClose(ev: Event, n: VNode, state: DeleteModal) =
|
proc onClose(ev: Event, n: VNode, state: DeleteModal) =
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import httpcore, options, sugar, json
|
import httpcore, options, sugar, json
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax/kajax
|
import karax/kajax
|
||||||
|
|
@ -54,7 +55,7 @@ when defined(js):
|
||||||
formData.append("postId", $state.post.id)
|
formData.append("postId", $state.post.id)
|
||||||
# TODO: Subject
|
# TODO: Subject
|
||||||
let uri = makeUri("/updatePost")
|
let uri = makeUri("/updatePost")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onEditPost(s, r, state))
|
(s: int, r: kstring) => onEditPost(s, r, state))
|
||||||
|
|
||||||
proc render*(state: EditBox, post: Post): VNode =
|
proc render*(state: EditBox, post: Post): VNode =
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import sugar, httpcore, options, json
|
import sugar, httpcore, options, json
|
||||||
import dom except Event, KeyboardEvent
|
import dom except Event, KeyboardEvent
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax / [kajax, kdom]
|
import karax / [kajax, kdom]
|
||||||
|
|
@ -30,7 +31,7 @@ when defined(js):
|
||||||
let form = dom.document.getElementById("login-form")
|
let form = dom.document.getElementById("login-form")
|
||||||
# TODO: This is a hack, karax should support this.
|
# TODO: This is a hack, karax should support this.
|
||||||
let formData = newFormData(form)
|
let formData = newFormData(form)
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onLogInPost(s, r, state))
|
(s: int, r: kstring) => onLogInPost(s, r, state))
|
||||||
|
|
||||||
proc onClose(ev: Event, n: VNode, state: LoginModal) =
|
proc onClose(ev: Event, n: VNode, state: LoginModal) =
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import options, httpcore, json, sugar, sequtils, strutils
|
||||||
when defined(js):
|
when defined(js):
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax/[kajax, kdom]
|
import karax/[kajax, kdom]
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
import error, karaxutils, post, user, threadlist
|
import error, karaxutils, post, user, threadlist
|
||||||
|
|
||||||
|
|
@ -116,7 +117,7 @@ when defined(js):
|
||||||
makeUri("/unlike")
|
makeUri("/unlike")
|
||||||
else:
|
else:
|
||||||
makeUri("/like")
|
makeUri("/like")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) =>
|
(s: int, r: kstring) =>
|
||||||
onPost(s, r, state, post, currentUser.get()))
|
onPost(s, r, state, post, currentUser.get()))
|
||||||
|
|
||||||
|
|
@ -172,7 +173,7 @@ when defined(js):
|
||||||
makeUri("/unlock")
|
makeUri("/unlock")
|
||||||
else:
|
else:
|
||||||
makeUri("/lock")
|
makeUri("/lock")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) =>
|
(s: int, r: kstring) =>
|
||||||
onPost(s, r, state, thread))
|
onPost(s, r, state, thread))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import httpcore, options, sugar, json, strutils, strformat
|
import httpcore, options, sugar, json, strutils, strformat
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax/[kajax, kdom]
|
import karax/[kajax, kdom]
|
||||||
|
|
@ -68,7 +69,7 @@ when defined(js):
|
||||||
formData.append("rank", $state.rank)
|
formData.append("rank", $state.rank)
|
||||||
formData.append("username", $state.profile.user.name)
|
formData.append("username", $state.profile.user.name)
|
||||||
let uri = makeUri("/saveProfile")
|
let uri = makeUri("/saveProfile")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onProfilePost(s, r, state))
|
(s: int, r: kstring) => onProfilePost(s, r, state))
|
||||||
|
|
||||||
proc needsSave(state: ProfileSettings): bool =
|
proc needsSave(state: ProfileSettings): bool =
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import strformat, options, httpcore, json, sugar
|
import strformat, options, httpcore, json, sugar
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
from dom import getElementById, scrollIntoView, setTimeout
|
from dom import getElementById, scrollIntoView, setTimeout
|
||||||
|
|
||||||
|
|
@ -56,7 +57,7 @@ when defined(js):
|
||||||
let formData = newFormData()
|
let formData = newFormData()
|
||||||
formData.append("msg", state.text)
|
formData.append("msg", state.text)
|
||||||
let uri = makeUri("/preview")
|
let uri = makeUri("/preview")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onPreviewPost(s, r, state))
|
(s: int, r: kstring) => onPreviewPost(s, r, state))
|
||||||
|
|
||||||
proc onMessageClick(e: Event, n: VNode, state: ReplyBox) =
|
proc onMessageClick(e: Event, n: VNode, state: ReplyBox) =
|
||||||
|
|
@ -80,7 +81,7 @@ when defined(js):
|
||||||
if replyingTo.isSome:
|
if replyingTo.isSome:
|
||||||
formData.append("replyingTo", $replyingTo.get().id)
|
formData.append("replyingTo", $replyingTo.get().id)
|
||||||
let uri = makeUri("/createPost")
|
let uri = makeUri("/createPost")
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onReplyPost(s, r, state))
|
(s: int, r: kstring) => onReplyPost(s, r, state))
|
||||||
|
|
||||||
proc onCancelClick(e: Event, n: VNode, state: ReplyBox) =
|
proc onCancelClick(e: Event, n: VNode, state: ReplyBox) =
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import sugar, httpcore, options, json
|
import sugar, httpcore, options, json
|
||||||
import dom except Event, KeyboardEvent
|
import dom except Event, KeyboardEvent
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax / [kajax, kdom]
|
import karax / [kajax, kdom]
|
||||||
|
|
@ -86,7 +87,7 @@ when defined(js):
|
||||||
let form = dom.document.getElementById("resetpassword-form")
|
let form = dom.document.getElementById("resetpassword-form")
|
||||||
# TODO: This is a hack, karax should support this.
|
# TODO: This is a hack, karax should support this.
|
||||||
let formData = newFormData(form)
|
let formData = newFormData(form)
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onPost(s, r, state))
|
(s: int, r: kstring) => onPost(s, r, state))
|
||||||
|
|
||||||
ev.preventDefault()
|
ev.preventDefault()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
when defined(js):
|
when defined(js):
|
||||||
import sugar, httpcore, options, json
|
import sugar, httpcore, options, json
|
||||||
import dom except Event
|
import dom except Event
|
||||||
|
import jsffi except `&`
|
||||||
|
|
||||||
include karax/prelude
|
include karax/prelude
|
||||||
import karax / [kajax, kdom]
|
import karax / [kajax, kdom]
|
||||||
|
|
@ -28,7 +29,7 @@ when defined(js):
|
||||||
let form = dom.document.getElementById("signup-form")
|
let form = dom.document.getElementById("signup-form")
|
||||||
# TODO: This is a hack, karax should support this.
|
# TODO: This is a hack, karax should support this.
|
||||||
let formData = newFormData(form)
|
let formData = newFormData(form)
|
||||||
ajaxPost(uri, @[], cast[cstring](formData),
|
ajaxPost(uri, @[], formData.to(cstring),
|
||||||
(s: int, r: kstring) => onSignUpPost(s, r, state))
|
(s: int, r: kstring) => onSignUpPost(s, r, state))
|
||||||
|
|
||||||
proc onClose(ev: Event, n: VNode, state: SignupModal) =
|
proc onClose(ev: Event, n: VNode, state: SignupModal) =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue