Content added Content deleted
(apply changes from sandbox - all tests pass) |
(mirror latest changes on WP - please do not cascade import modules) |
||
| Line 97: | Line 97: | ||
end |
end |
||
end |
end |
||
-- We test for false specifically here so that nil (the default) acts like true. |
-- We test for false specifically here so that nil (the default) acts like true. |
||
if found or options.frameOnly == false then |
if found or options.frameOnly == false then |
||
| Line 122: | Line 122: | ||
luaArgs = frame |
luaArgs = frame |
||
end |
end |
||
-- Set the order of precedence of the argument tables. If the variables are |
-- Set the order of precedence of the argument tables. If the variables are |
||
-- nil, nothing will be added to the table, which is how we avoid clashes |
-- nil, nothing will be added to the table, which is how we avoid clashes |
||
-- between the frame/parent args and the Lua args. |
-- between the frame/parent args and the Lua args. |
||
local argTables = {fargs} |
local argTables = {fargs} |
||
argTables[#argTables + 1] = pargs |
argTables[#argTables + 1] = pargs |
||
| Line 272: | Line 272: | ||
return pairs(metaArgs) |
return pairs(metaArgs) |
||
end |
end |
||
local function inext(t, i) |
local function inext(t, i) |
||
-- This uses our __index metamethod |
-- This uses our __index metamethod |
||