Mercurial > wow > cyborg-mmo7

diff WowObjects.lua @ 23:3b1c0b676583

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplified the CallbackFactory object model.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:30:36 +0000
parents cccc7661a2e6
children 6906d8ffd580
line wrap: on
line diff
--- a/WowObjects.lua	Thu Apr 25 01:30:31 2013 +0000
+++ b/WowObjects.lua	Thu Apr 25 01:30:36 2013 +0000
@@ -47,7 +47,7 @@
 	end,
 
 	ClearBinding = function(key)
-		local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(CyborgMMO_WowObject.DoNothing)
+		local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory:AddCallback(CyborgMMO_WowObject.DoNothing)
 		SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
 	end,
 
@@ -138,7 +138,7 @@
 		end
 
 		self.DoAction = function()
-			local action = CyborgMMO_CallbackFactory.Instance().GetCallback(self.CallbackName)
+			local action = CyborgMMO_CallbackFactory:GetCallback(self.CallbackName)
 			CyborgMMO_DPrint("calling callback:- "..self.CallbackName)
 			action()
 		end
@@ -168,8 +168,8 @@
 		end
 
 		self.SetBinding = function(key)
-			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction)
-			SetOverrideBindingClick(CyborgMMO_CallbackFactory.Instance().Frame, true, key, name, "LeftButton")
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory:AddCallback(self.DoAction)
+			SetOverrideBindingClick(CyborgMMO_CallbackFactory.Frame, true, key, name, "LeftButton")
 		end
 
 		return self
@@ -207,7 +207,7 @@
 		end
 
 		self.SetBinding = function(key)
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "ITEM "..self.Name)
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Frame, true, key, "ITEM "..self.Name)
 		end
 
 		return self
@@ -241,7 +241,7 @@
 		self.SetBinding = function(key)
 			CyborgMMO_DPrint("Binding to key "..key)
 			self.Key = key
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, self.Key, self.Type.." "..self.Name)
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Frame, true, self.Key, self.Type.." "..self.Name)
 		end
 
 		return self
@@ -274,7 +274,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MACRO "..self.Index)
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Frame, true, key, "MACRO "..self.Index)
 		end
 
 		return self
@@ -310,7 +310,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction)
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory:AddCallback(self.DoAction)
 			SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
 		--	SetOverrideBinding(hiddenModeChanger, true, key, "MACRO "..self.Index)
 		end
@@ -348,7 +348,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MERCHANT "..self.Index)
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Frame, true, key, "MERCHANT "..self.Index)
 		end
 
 		return self
@@ -380,7 +380,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
+			local buttonFrame,parentFrame,name = CyborgMMO_CallbackFactory:AddCallback(self.DoAction);
 			SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")
 		end