# HG changeset patch # User Flick # Date 1300818904 25200 # Node ID 158c9299185b35e8ca41c27613b28c51a6cc5298 # Parent 98114c158e620300ec7c58f9ef7c84a455961bf7 Fix button type config lookup diff -r 98114c158e62 -r 158c9299185b ReAction.lua --- a/ReAction.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/ReAction.lua Tue Mar 22 11:35:04 2011 -0700 @@ -305,7 +305,7 @@ end function ReAction:RegisterBarType( class, isDefault ) - local name = class:GetBarType() + local name = class:GetButtonTypeID() self.barTypes[name] = class if isDefault then self.defaultBarType = name diff -r 98114c158e62 -r 158c9299185b classes/ActionButton.lua --- a/classes/ActionButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/ActionButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -184,7 +184,8 @@ buttons = { }, }, - barType = L["Action Bar"] + barType = L["Action Bar"], + buttonTypeID = buttonTypeID }, { __index = Super } ) diff -r 98114c158e62 -r 158c9299185b classes/BagButton.lua --- a/classes/BagButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/BagButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -30,6 +30,7 @@ }, barType = L["Bag Bar"], + buttonTypeID = buttonTypeID }, { __index = Super } ) diff -r 98114c158e62 -r 158c9299185b classes/Button.lua --- a/classes/Button.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/Button.lua Tue Mar 22 11:35:04 2011 -0700 @@ -124,6 +124,10 @@ return self.barType end +function Button:GetButtonTypeID() + return self.buttonTypeID +end + function Button:GetConfig() return self.config end diff -r 98114c158e62 -r 158c9299185b classes/MultiCastButton.lua --- a/classes/MultiCastButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/MultiCastButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -316,6 +316,7 @@ }, barType = L["Totem Bar"], + buttonTypeID = buttonTypeID }, { __index = Action } ) diff -r 98114c158e62 -r 158c9299185b classes/PetActionButton.lua --- a/classes/PetActionButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/PetActionButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -71,6 +71,7 @@ }, barType = L["Pet Action Bar"], + buttonTypeID = buttonTypeID }, { __index = Super } ) diff -r 98114c158e62 -r 158c9299185b classes/StanceButton.lua --- a/classes/StanceButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/StanceButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -45,6 +45,7 @@ }, barType = L["Stance Bar"], + buttonTypeID = buttonTypeID }, { __index = Super } ) diff -r 98114c158e62 -r 158c9299185b classes/VehicleExitButton.lua --- a/classes/VehicleExitButton.lua Tue Mar 22 11:14:21 2011 -0700 +++ b/classes/VehicleExitButton.lua Tue Mar 22 11:35:04 2011 -0700 @@ -21,6 +21,7 @@ }, barType = L["Exit Vehicle Floater"], + buttonTypeID = buttonTypeID }, { __index = Super } )