From 46610ed19cbbdf199c43654a38a89b20963be668 Mon Sep 17 00:00:00 2001 From: Michael Tindal Date: Sun, 23 Feb 2014 03:26:22 -0800 Subject: [PATCH] Move the hooksecurefunc into the initialize. --- .../modules/characterframe/characterframe.lua | 46 ++++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua index a03c7ee..cd22cea 100755 --- a/ElvUI_SLE/modules/characterframe/characterframe.lua +++ b/ElvUI_SLE/modules/characterframe/characterframe.lua @@ -4,29 +4,6 @@ local CFO = E:NewModule('CharacterFrameOptions', 'AceEvent-3.0'); local f = CreateFrame('Frame', 'KnightArmory', PaperDollFrame) local C = KnightFrame_Armory_Constants -hooksecurefunc(_G, 'PaperDollFrame_SetLevel', function() - local primaryTalentTree = GetSpecialization() - local classDisplayName, class = UnitClass("player") - local classColorString = RAID_CLASS_COLORS[class].colorStr - local specName, _; - local PLAYER_LEVEL = "|c%sLevel %s %s %s|r" - local PLAYER_LEVEL_NO_SPEC = "|c%sLevel %s %s|r" - if (primaryTalentTree) then - _, specName = GetSpecializationInfo(primaryTalentTree); - end - - if (specName and specName ~= "") then - CharacterLevelText:SetFormattedText(PLAYER_LEVEL, classColorString, UnitLevel("player"), specName, classDisplayName); - else - CharacterLevelText:SetFormattedText(PLAYER_LEVEL_NO_SPEC, classColorString, UnitLevel("player"), classDisplayName); - end - - CharacterFrameTitleText:ClearAllPoints() - CharacterFrameTitleText:Point('TOP', f, 'TOP', 0, 0) - CharacterLevelText:ClearAllPoints() - CharacterLevelText:SetPoint('TOP', CharacterFrameTitleText, 'BOTTOM', 0, 0) -end) - local function GemSocket_OnClick(self, button) self = self:GetParent() @@ -545,6 +522,29 @@ end function CFO:Initialize() if not E.private.sle.characterframeoptions.enable then return end + hooksecurefunc(_G, 'PaperDollFrame_SetLevel', function() + local primaryTalentTree = GetSpecialization() + local classDisplayName, class = UnitClass("player") + local classColorString = RAID_CLASS_COLORS[class].colorStr + local specName, _; + local PLAYER_LEVEL = "|c%sLevel %s %s %s|r" + local PLAYER_LEVEL_NO_SPEC = "|c%sLevel %s %s|r" + if (primaryTalentTree) then + _, specName = GetSpecializationInfo(primaryTalentTree); + end + + if (specName and specName ~= "") then + CharacterLevelText:SetFormattedText(PLAYER_LEVEL, classColorString, UnitLevel("player"), specName, classDisplayName); + else + CharacterLevelText:SetFormattedText(PLAYER_LEVEL_NO_SPEC, classColorString, UnitLevel("player"), classDisplayName); + end + + CharacterFrameTitleText:ClearAllPoints() + CharacterFrameTitleText:Point('TOP', f, 'TOP', 0, 0) + CharacterLevelText:ClearAllPoints() + CharacterLevelText:SetPoint('TOP', CharacterFrameTitleText, 'BOTTOM', 0, 0) + end) + CFO:StartArmoryFrame() end -- 1.7.9.5