Speed up generation of dispatching tree

1 files changed, 10 insertions, 8 deletions

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 3cfa6c7044..6d3661a542 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -449,17 +449,19 @@ end
 --- Create a template render dispatching target.
 -- @param	name	Template to be rendered
 function template(name)
-	require("luci.template")
-	return function() luci.template.render(name) end
+	return function()
+		require("luci.template")
+		luci.template.render(name)
+	end
 end
 
 --- Create a CBI model dispatching target.
 -- @param	model	CBI model tpo be rendered
 function cbi(model)
-	require("luci.cbi")
-	require("luci.template")
-
 	return function(...)
+		require("luci.cbi")
+		require("luci.template")
+
 		local stat, maps = luci.util.copcall(luci.cbi.load, model, ...)
 		if not stat then
 			error500(maps)
@@ -485,10 +487,10 @@ end
 --- Create a CBI form model dispatching target.
 -- @param	model	CBI form model tpo be rendered
 function form(model)
-	require("luci.cbi")
-	require("luci.template")
-
 	return function(...)
+		require("luci.cbi")
+		require("luci.template")
+
 		local stat, maps = luci.util.copcall(luci.cbi.load, model, ...)
 		if not stat then
 			error500(maps)