From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 27 Nov 2018 13:46:55 +0000 (+0100)
Subject: luci-base: dispatcher: remove tree modifier support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2e36e09303c9b0054d1ead830d841ae170197db7;p=project%2Fluci.git

luci-base: dispatcher: remove tree modifier support

This feature was never used, is hardly documented and appears to be
designed to fiddle with the internal dispatch tree state.

Given that, simply drop the related code to simplify the dispatcher
class somewhat.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index c4066a2592..9d6f586b1d 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -595,11 +595,9 @@ function createtree()
 
 	local ctx  = context
 	local tree = {nodes={}, inreq=true}
-	local modi = {}
 
 	ctx.treecache = setmetatable({}, {__mode="v"})
 	ctx.tree = tree
-	ctx.modifiers = modi
 
 	local scope = setmetatable({}, {__index = luci.dispatcher})
 
@@ -609,28 +607,9 @@ function createtree()
 		v()
 	end
 
-	local function modisort(a,b)
-		return modi[a].order < modi[b].order
-	end
-
-	for _, v in util.spairs(modi, modisort) do
-		scope._NAME = v.module
-		setfenv(v.func, scope)
-		v.func()
-	end
-
 	return tree
 end
 
-function modifier(func, order)
-	context.modifiers[#context.modifiers+1] = {
-		func = func,
-		order = order or 0,
-		module
-			= getfenv(2)._NAME
-	}
-end
-
 function assign(path, clone, title, order)
 	local obj  = node(unpack(path))
 	obj.nodes  = nil
diff --git a/modules/luci-base/luasrc/dispatcher.luadoc b/modules/luci-base/luasrc/dispatcher.luadoc
index f26256953a..a77f8d8b07 100644
--- a/modules/luci-base/luasrc/dispatcher.luadoc
+++ b/modules/luci-base/luasrc/dispatcher.luadoc
@@ -81,15 +81,6 @@ Build the index before if it does not exist yet.
 @name createtree
 ]]
 
----[[
-Register a tree modifier.
-
-@class function
-@name modifier
-@param	func	Modifier function
-@param	order	Modifier order value (optional)
-]]
-
 ---[[
 Clone a node of the dispatching tree to another position.