From 23e0a7da6a698072871081364e8c7edf76a36f32 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 17 Nov 2009 16:12:53 +0000 Subject: [PATCH] CBI: Allow lazy loading of wizard pages (improving RAM usage) --- libs/cbi/luasrc/cbi.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index 5a1d92385..9b947cb2f 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -519,10 +519,6 @@ function Delegator.__init__(self, ...) end function Delegator.set(self, name, node) - if type(node) == "table" and getmetatable(node) == nil then - node = Compound(unpack(node)) - end - assert(type(node) == "function" or instanceof(node, Compound), "Invalid") assert(not self.nodes[name], "Duplicate entry") self.nodes[name] = node @@ -562,7 +558,17 @@ function Delegator.set_route(self, ...) end function Delegator.get(self, name) - return self.nodes[name] + local node = self.nodes[name] + + if type(node) == "string" then + node = load(node) + end + + if type(node) == "table" and getmetatable(node) == nil then + node = Compound(unpack(node)) + end + + return node end function Delegator.parse(self, ...) -- 2.25.1