Update Frame.lua
quick fix for removing events
This commit is contained in:
@@ -3,6 +3,7 @@ local _OBJECTS = require("loadObjects")
|
|||||||
local BasaltDraw = require("basaltDraw")
|
local BasaltDraw = require("basaltDraw")
|
||||||
local utils = require("utils")
|
local utils = require("utils")
|
||||||
local layout = require("layout")
|
local layout = require("layout")
|
||||||
|
local log = require("basaltLogs")
|
||||||
local uuid = utils.uuid
|
local uuid = utils.uuid
|
||||||
local rpairs = utils.rpairs
|
local rpairs = utils.rpairs
|
||||||
local xmlValue = utils.getValueFromXML
|
local xmlValue = utils.getValueFromXML
|
||||||
@@ -206,20 +207,22 @@ return function(name, parent, pTerm, basalt)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function removeEvent(self, event, obj)
|
local function removeEvent(self, event, obj)
|
||||||
for a, b in pairs(events[event]) do
|
if(events[event]~=nil)then
|
||||||
for key, value in pairs(b) do
|
for a, b in pairs(events[event]) do
|
||||||
if (value == obj) then
|
for key, value in pairs(b) do
|
||||||
table.remove(events[event][a], key)
|
if (value == obj) then
|
||||||
if(#events[event][a]<=0)then
|
table.remove(events[event][a], key)
|
||||||
events[event][a] = nil
|
if(#events[event][a]<=0)then
|
||||||
if(self.parent~=nil)then
|
events[event][a] = nil
|
||||||
if(tableCount(events[event])<=0)then
|
if(self.parent~=nil)then
|
||||||
activeEvents[event] = false
|
if(tableCount(events[event])<=0)then
|
||||||
self.parent:removeEvent(event, self)
|
activeEvents[event] = false
|
||||||
|
self.parent:removeEvent(event, self)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
return true;
|
||||||
end
|
end
|
||||||
return true;
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user