From 2536062b7c2ffc031c70b9b92216b771a1206f98 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:56:18 +0800
Subject: [PATCH] fixes #291; incorrect `this` access (#292)

fixes #291

since Nim support JS lambda lifting. The meaning of `this` has changed in the closure functions. It represents captured variables rather than binding objects.
---
 karax/kajax.nim | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/karax/kajax.nim b/karax/kajax.nim
index 4235b50..8c284b7 100644
--- a/karax/kajax.nim
+++ b/karax/kajax.nim
@@ -16,7 +16,6 @@ type
   FormData* {.importc.} = JsObject
 
   HttpRequest* {.importc.} = ref object
-  ThisObj {.importc.} = ref object
     readyState, status: int
     responseText, statusText: cstring
 
@@ -50,7 +49,6 @@ proc uploadFile*(url: cstring, file: Blob, onprogress :proc(data: ProgressEvent)
     cont(httpStatus, response)
 
   proc upload(r: HttpRequest):XMLHttpRequestUpload {.importcpp: "#.upload".}
-  var this {.importc: "this".}: ThisObj
 
   var formData = newFormData()
   formData.append("upload_file",file)
@@ -60,8 +58,8 @@ proc uploadFile*(url: cstring, file: Blob, onprogress :proc(data: ProgressEvent)
   for a, b in items(headers):
     ajax.setRequestHeader(a, b)
   ajax.statechange proc() =
-    if this.readyState == 4:
-      contWrapper(this.status, this.responseText)
+    if ajax.readyState == 4:
+      contWrapper(ajax.status, ajax.responseText)
   ajax.upload.onprogress = onprogress
   ajax.send(formData.to(cstring))
 
@@ -76,18 +74,17 @@ proc ajax*(meth, url: cstring; headers: openarray[(cstring, cstring)];
     cont(httpStatus, response)
     if doRedraw: redraw(kxi)
 
-  var this {.importc: "this".}: ThisObj
 
   let ajax = newRequest()
   ajax.open(meth, url, true)
   for a, b in items(headers):
     ajax.setRequestHeader(a, b)
   ajax.statechange proc() =
-    if this.readyState == 4:
-      if this.status == 200:
-        contWrapper(this.status, this.responseText)
+    if ajax.readyState == 4:
+      if ajax.status == 200:
+        contWrapper(ajax.status, ajax.responseText)
       else:
-        contWrapper(this.status, this.responseText)
+        contWrapper(ajax.status, ajax.responseText)
   if useBinary:
     ajax.send(blob)
   else: