Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 16:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

getn(arg) -> arg.n

Browse Source
This commit is contained in:
Pinya
2018-07-22 21:19:03 +03:00
parent 4557a15bcf
commit 0bdcbbca6c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Libraries/CallbackHandler-1.0/CallbackHandler-1.0.lua
+8 -8
View File
@@ -7,7 +7,7 @@ if not CallbackHandler then return end -- No upgrade needed
local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end} local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
-- Lua APIs -- Lua APIs
local tconcat, getn = table.concat, table.getn local tconcat = table.concat
local assert, error, loadstring = assert, error, loadstring local assert, error, loadstring = assert, error, loadstring
local setmetatable, rawset, rawget = setmetatable, rawset, rawget local setmetatable, rawset, rawget = setmetatable, rawset, rawget
local next, pairs, type, tostring = next, pairs, type, tostring local next, pairs, type, tostring = next, pairs, type, tostring
@@ -87,7 +87,7 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
local oldrecurse = registry.recurse local oldrecurse = registry.recurse
registry.recurse = oldrecurse + 1 registry.recurse = oldrecurse + 1
Dispatchers[getn(arg) + 1](events[eventname], eventname, unpack(arg)) Dispatchers[arg.n + 1](events[eventname], eventname, unpack(arg))
registry.recurse = oldrecurse registry.recurse = oldrecurse
@@ -138,7 +138,7 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2) error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2)
end end
if getn(arg)>=1 then -- this is not the same as testing for arg==nil! if arg.n>=1 then -- this is not the same as testing for arg==nil!
local a1=arg[1] local a1=arg[1]
regfunc = function(...) self[method](self,a1,unpack(arg)) end regfunc = function(...) self[method](self,a1,unpack(arg)) end
else else
@@ -150,9 +150,9 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread expected.", 2) error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread expected.", 2)
end end
if getn(arg)>=1 then -- this is not the same as testing for arg==nil! if arg.n>=1 then -- this is not the same as testing for arg==nil!
local a1=arg[1] local a1=arg[1]
regfunc = function(...) method(arg,unpack(arg)) end regfunc = function(...) method(a1,unpack(arg)) end
else else
regfunc = method regfunc = method
end end
@@ -198,15 +198,15 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
-- OPTIONAL: Unregister all callbacks for given selfs/addonIds -- OPTIONAL: Unregister all callbacks for given selfs/addonIds
if UnregisterAllName then if UnregisterAllName then
target[UnregisterAllName] = function(...) target[UnregisterAllName] = function(...)
if getn(arg)<1 then if arg.n<1 then
error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2) error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2)
end end
if getn(arg)==1 and arg[1]==target then if arg.n==1 and arg[1]==target then
error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2) error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2)
end end
for i=1,getn(arg) do for i=1,arg.n do
local self = arg[i] local self = arg[i]
if registry.insertQueue then if registry.insertQueue then
for eventname, callbacks in pairs(registry.insertQueue) do for eventname, callbacks in pairs(registry.insertQueue) do