Mercurial > wow > cyborg-mmo7
diff RatPageView.lua @ 4:d186f8cd5000
Renamed functions to avoid conflicts
author | madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 |
---|---|
date | Mon, 28 May 2012 15:54:52 +0000 |
parents | bf9220814fb5 |
children | 8428fa7cf0e4 |
line wrap: on
line diff
--- a/RatPageView.lua Thu May 24 16:13:28 2012 +0000 +++ b/RatPageView.lua Mon May 28 15:54:52 2012 +0000 @@ -18,7 +18,7 @@ --~ along with this program; if not, write to the Free Software --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -RatPageView = { +CyborgMMO_RatPageView = { new = function(self) msg("new Rat Page View"); for _, child in ipairs(self:GetChildren()) do @@ -27,12 +27,12 @@ self.SlotClicked = function(slot) msg("View Recieved Click") - RatPageController.Instance().SlotClicked(slot) + CyborgMMO_RatPageController.Instance().SlotClicked(slot) end self.ModeClicked = function(mode) msg("View Recieved Click") - RatPageController.Instance().ModeClicked(mode) + CyborgMMO_RatPageController.Instance().ModeClicked(mode) end self.RegisterMode = function() @@ -46,14 +46,14 @@ end } -RatQuickPageView = { +CyborgMMO_RatQuickPageView = { new = function(self) for _, child in ipairs(self:GetChildren()) do child.Register(); end self.SlotClicked = function(slot) - RatPageController.Instance().SlotClicked(slot) + CyborgMMO_RatPageController.Instance().SlotClicked(slot) end return self; @@ -61,14 +61,13 @@ } -- Slot Class -- -SlotView = { +CyborgMMO_SlotView = { new = function(self, parent) self._assignedWowObject = nil; + self.UnCheckedTexture = self:GetNormalTexture(); self:RegisterForClicks("LeftButtonUp", "RightButtonUp"); self.Id = self:GetID(); - RatPageModel.Instance().AddObserver(self); - self.UnCheckedTexture = self:GetNormalTexture(); - + CyborgMMO_RatPageModel.Instance().AddObserver(self); -- Object Method -- self.Clicked = function() self:GetParent().SlotClicked(self) @@ -94,11 +93,11 @@ end, } -SlotMiniView = { +CyborgMMO_SlotMiniView = { new = function(self, parent) self._assignedWowObject = nil; self.Id = self:GetID(); - RatPageModel.Instance().AddObserver(self); + CyborgMMO_RatPageModel.Instance().AddObserver(self); self.UnCheckedTexture = self:GetNormalTexture(); self.Update = function(data, activeMode) @@ -120,11 +119,11 @@ -- ModeButton -- -ModeView = { +CyborgMMO_ModeView = { new = function(self) self.Id = self:GetID(); self.Name = self:GetName(); - RatPageModel.Instance().AddObserver(self); + CyborgMMO_RatPageModel.Instance().AddObserver(self); if(self.Id ~= 1) then self:Hide() end