Merge branch 'master' of https://github.com/EliasFleckenstein03/lua_async

diff --git a/events.lua b/events.lua
index 479697321cbe1ecf3539d53a65fa646f49de1c65..aa645eaf8c554a80a9eeaaade39fa8d09343ec26 100644 (file)
--- a/events.lua
+++ b/events.lua
@@ -18,13 +18,13 @@ local EventTargetPrototype = {}
 function EventTargetPrototype:dispatchEvent(event)
        event.target = self
 
-       local callback = self["on" + event.type]
+       local callback = self["on" .. event.type]
 
        if callback then
                callback(event)
        end
 
-       local listeners = self.__eventListeners[type]
+       local listeners = self.__eventListeners[event.type]
 
        if listeners then
                for i, callback in ipairs(listeners) do

diff --git a/init.lua b/init.lua
index b5cb92e17f932a15376d939aad213b2fa186574a..8449a0f1e2c6d962298f08031fd29da90d9edbb0 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,6 @@
-lua_async = {}
+lua_async = {
+       poll_functions = {},
+}
 
 function lua_async.clock()
        return lua_async.socket and lua_async.socket.gettime() or os.clock()
@@ -9,11 +11,14 @@ function lua_async.step(dtime)
        lua_async.timeouts.step(dtime)
        lua_async.intervals.step(dtime)
 
-       -- pending callbacks phase is done by minetest
+       -- pending callbacks phase is obsolete
 
        -- idle & prepare phase are obsolete
 
-       -- poll phase is obsolete
+       -- poll phase
+       for func in pairs(lua_async.poll_functions) do
+               func()
+       end
 
        -- check phase
        lua_async.immediates.step(dtime)
@@ -36,6 +41,6 @@ return function(path, no_socket)
                "limiting",
                "events",
        } do
-               dofile(path .. f .. ".lua")
+               dofile(path .. "/" .. f .. ".lua")
        end
 end