Mercurial > wow > reaction

changeset 291:54d7865baae9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 1.1 beta 9 to stable
author Flick
date Fri, 01 Jul 2011 14:35:48 -0700
parents 77609bfa804e (current diff) 9671965c7a58 (diff)
children 30c9bdaad7a3
files .hgtags
diffstat 3 files changed, 20 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jun 11 10:57:00 2011 -0700
+++ b/.hgtags	Fri Jul 01 14:35:48 2011 -0700
@@ -6,3 +6,4 @@
 b2e401183d36cd1283df64eef68a92a9ce08cc46 1.1 beta 6
 28f91ed1560ff659d92f3dd3d3042dd818d1d198 1.1 beta 7
 499ca4edf033da3ec4fc52fd1058bf27b2679bbe 1.1 beta 8
+d913dd4878af0e4fa0380c777be74088b5a49ffc 1.1 beta 9
--- 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()
--- a/ReAction.toc	Sat Jun 11 10:57:00 2011 -0700
+++ b/ReAction.toc	Fri Jul 01 14:35:48 2011 -0700
@@ -1,4 +1,4 @@
-## Interface: 40100
+## Interface: 40200
 ## Title: ReAction
 ## Notes: Action button layout and configuration
 ## DefaultState: enabled