Merge pull request #918 from MasterBel2/spring-cleaning

Spring cleaning

LuaMenu/widgets/chobby/components/battle/battle_list_window.lua

@@ -58,10 +58,6 @@ function BattleListWindow:init(parent)
 		}
 	end
 
-	local function update()
-		self:Update()
-	end
-
 	self.infoPanel = Panel:New {
 		classname = "overlay_window",
 		x = "15%",
@@ -196,6 +192,7 @@ function BattleListWindow:init(parent)
 		checkVsAI:SetToggle(Configuration.battleFilterVsAI)
 	end
 	WG.Delay(UpdateCheckboxes, 0.2)
+	-- Delay required as Configuration:GetConfigData (where these values are set) runs after this is initialised.
 
 	self:SetMinItemWidth(100000)
 	self.columns = 3
@@ -259,7 +256,7 @@ function BattleListWindow:init(parent)
 
 	local function onConfigurationChange(listener, key, value)
 		if key == "displayBadEngines2" then
-			update()
+			self:Update()
 		elseif key == "battleFilterRedundant" then
 			self:SoftUpdate()
 		end
@@ -273,7 +270,7 @@ function BattleListWindow:init(parent)
 	end
 	WG.DownloadHandler.AddListener("DownloadFinished", downloadFinished)
 
-	update()
+	self:Update()
 end
 
 function BattleListWindow:RemoveListeners()

LuaMenu/widgets/chobby/components/downloader.lua

@@ -1,8 +1,6 @@
-Downloader = Component:extends{}
+Downloader = LCS.class{}
 
 function Downloader:init(buttonsMode, tbl, timeout, updateListener, completeListener, queueFont, visibleListener)
-	self:super("init")
-
 	self.wrapperAsFallback = false
 
 	queueFont = queueFont or 1

LuaMenu/widgets/chobby/components/list_window.lua

@@ -1,7 +1,6 @@
-ListWindow = Component:extends{}
+ListWindow = LCS.class{}
 
 function ListWindow:init(parent, title, noWindow, windowClassname, noClose, customPadding, bottomSpacing)
-	self:DoInit() -- Lack of inheritance strikes again.
 
 	self.CancelFunc = function ()
 		self:HideWindow()

LuaMenu/widgets/chobby/components/priority_popup.lua

@@ -1,4 +1,6 @@
-PriorityPopup = Component:extends{}
+PriorityPopup = LCS.class{}
+
+PriorityPopup.registeredPopups = {}
 
 function PriorityPopup:init(mainWindow, cancelFunction, acceptFunction, parentControlOverride, hideWindow, disableAcceptHotkey)
 	local sentTime
@@ -117,7 +119,7 @@ function PriorityPopup:init(mainWindow, cancelFunction, acceptFunction, parentCo
 	local sw, sh = Spring.GetWindowGeometry()
 	self:ViewResize(sw, sh)
 
-	self:super('init')
+	table.insert(PriorityPopup.registeredPopups, self)
 end
 
 function PriorityPopup:ViewResize(screenWidth, screenHeight)
@@ -141,3 +143,11 @@ function PriorityPopup:ClosePopup()
 		self.mainWindow:Dispose()
 	end
 end
+
+function PriorityPopup:unregister()
+	for i, comp in pairs(PriorityPopup.registeredPopups) do
+		if comp == self then
+			table.remove(PriorityPopup.registeredPopups, i)
+		end
+	end
+end

LuaMenu/widgets/chobby/components/sortable_list.lua

@@ -1,8 +1,7 @@
-SortableList = Component:extends{}
+SortableList = LCS.class{}
 
 function SortableList:init(holder, headings, itemHeight, defaultSort, sortDirection, scrollPanelOverride, ItemInFilter)
-	self:DoInit() -- Lack of inheritance strikes again.
-
+
 	self.sortBy = false
 	self.smallToLarge = sortDirection
 	if self.smallToLarge == nil then

LuaMenu/widgets/chobby/core.lua

@@ -6,7 +6,6 @@ local includes = {
 	"components/configuration.lua",
 
 	-- basic components
-	"components/component.lua",
 	"components/list_window.lua",
 	"components/console.lua",
 	"components/user_list_panel.lua",
@@ -92,19 +91,17 @@ function Chobby:_Initialize()
 	end)
 end
 
-function Chobby:GetRegisteredComponents()
-	return Component.registeredComponents
+function Chobby:GetRegisteredPopups()
+	return PriorityPopup.registeredPopups
 end
 
 function Chobby:_DrawScreen()
-	self:WrapCall(function()
-	end)
 end
 
 function Chobby:_ViewResize(sw, sh)
 	self:WrapCall(function()
-		for i, comp in pairs(self:GetRegisteredComponents()) do
-			comp:ViewResize(sw, sh)
+		for i, popup in pairs(self:GetRegisteredPopups()) do
+			popup:ViewResize(sw, sh)
 		end
 	end)
 end