diff Bar.lua @ 291:54d7865baae9 stable

Merge 1.1 beta 9 to stable
author Flick
date Fri, 01 Jul 2011 14:35:48 -0700
parents d931fa418e17
children 0cb6a9944497
line wrap: on
line diff
--- a/Bar.lua	Sat Jun 11 10:57:00 2011 -0700
+++ b/Bar.lua	Fri Jul 01 14:35:48 2011 -0700
@@ -192,6 +192,19 @@
   f:SetClampedToScreen(true)
   LSG:AddFrame(f)
 
+  if ReAction.LBF then
+    local g = ReAction.LBF:Group(L["ReAction"], self.name)
+    self.config.ButtonFacade = self.config.ButtonFacade or {
+      skinID = "Blizzard",
+      backdrop = true,
+      gloss = 0,
+      colors = {},
+    }
+    local c = self.config.ButtonFacade
+    g:Skin(c.skinID, c.gloss, c.backdrop, c.colors)
+    self.LBFGroup = g
+  end
+
   -- secure handlers
   f:Execute(_reaction_init)
   f:SetAttribute("_onstate-reaction",   _onstate_reaction)
@@ -210,23 +223,13 @@
   end
 
   self:ApplyAnchor()
-  self:SetConfigMode(ReAction:GetConfigMode())
-  self:SetKeybindMode(ReAction:GetKeybindMode())
-
-  if ReAction.LBF then
-    local g = ReAction.LBF:Group(L["ReAction"], self.name)
-    self.config.ButtonFacade = self.config.ButtonFacade or {
-      skinID = "Blizzard",
-      backdrop = true,
-      gloss = 0,
-      colors = {},
-    }
-    local c = self.config.ButtonFacade
-    g:Skin(c.skinID, c.gloss, c.backdrop, c.colors)
-    self.LBFGroup = g
+  if ReAction:GetConfigMode() then
+    self:SetConfigMode(true)
   end
-
   ReAction.RegisterCallback(self, "OnConfigModeChanged")
+  if ReAction:GetKeybindMode() then
+    self:SetKeybindMode(true)
+  end
 
   buttonClass:SetupBar(self)
   self:ApplyStates()