Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: merge r7851

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-10-30 15:01:48 +00:00
parent 0dd60c237b
commit 206146b65f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/web/luasrc/dispatcher.lua
View file

@ -284,13 +284,15 @@ function dispatch(request)
assert(media, "No valid theme found") assert(media, "No valid theme found")
end end
local function ifattr(cond, key, val) local function _ifattr(cond, key, val)
if cond then if cond then
local env = getfenv(1) local env = getfenv(3)
local scope = (type(env.self) == "table") and env.self
return string.format( return string.format(
' %s="%s"', tostring(key), ' %s="%s"', tostring(key),
luci.util.pcdata(tostring( val luci.util.pcdata(tostring( val
or (type(env[key]) ~= "function" and env[key]) or (type(env[key]) ~= "function" and env[key])
or (scope and type(scope[key]) ~= "function" and scope[key])
or "" )) or "" ))
) )
else else
@ -308,8 +310,8 @@ function dispatch(request)
media = media; media = media;
theme = fs.basename(media); theme = fs.basename(media);
resource = luci.config.main.resourcebase; resource = luci.config.main.resourcebase;
ifattr = ifattr; ifattr = function(...) return _ifattr(...) end;
attr = function(...) return ifattr(true, ...) end attr = function(...) return _ifattr(true, ...) end;
}, {__index=function(table, key) }, {__index=function(table, key)
if key == "controller" then if key == "controller" then
return build_url() return build_url()