From d0c503e096d55cd337d99f19706ac462cb083190 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Thu, 31 Oct 2024 16:37:28 +0800 Subject: [PATCH] - Update sources --- Zframework/init.lua | 5 ++++- Zframework/js.lua | 9 ++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Zframework/init.lua b/Zframework/init.lua index 8dc31e25..0bf93131 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -212,7 +212,10 @@ if JS then }); ]] ), function(data) print("In callback: " .. data); res=data end) - repeat love.timer.sleep(0.01) until res + repeat + love.timer.sleep(0.01) + JS.retrieveData(0.01) + until res print("In lua: " .. res) return res end diff --git a/Zframework/js.lua b/Zframework/js.lua index 0df005fa..e594fb4e 100644 --- a/Zframework/js.lua +++ b/Zframework/js.lua @@ -23,16 +23,11 @@ end --If you pass arguments to the func beyond the string, it will perform automatically string.format --Return statement is possible inside this structure --This will return a string containing a function to be called by JS.callJS -local _unpack -if(_VERSION == "Lua 5.1" or _VERSION == "LuaJIT") then - _unpack = unpack -else - _unpack = table.unpack -end + function JS.stringFunc(str, ...) str = "(function(){"..str.."})()" if(#arg > 0) then - str = str:format(_unpack(arg)) + str = str:format(unpack(arg)) end str = str:gsub("[\n\t]", "") return str