From 49ce72eef478c10df4e3c8076e55aa3922fcc919 Mon Sep 17 00:00:00 2001 From: Arnvid Karstad Date: Sat, 20 Apr 2024 18:50:11 +0200 Subject: [PATCH] 10.2.6.1 - [retail] Fixed some missing _G references and cleared out luacheck warnings --- Skin/Interface/AddOns/Blizzard_PlayerChoice.lua | 2 +- Skin/Interface/FrameXML/ColorPickerFrame.lua | 1 - Skin/Interface/FrameXML/LFGFrame.lua | 10 +++++----- Skin/Interface/FrameXML/LFGList.lua | 2 +- Skin/Interface/FrameXML/ReadyCheck.lua | 1 - Skin/Interface/FrameXML/RolePoll.lua | 8 ++++---- Skin/Interface/SharedXML/AddonList.lua | 3 ++- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Skin/Interface/AddOns/Blizzard_PlayerChoice.lua b/Skin/Interface/AddOns/Blizzard_PlayerChoice.lua index 55f04890..d4c89508 100644 --- a/Skin/Interface/AddOns/Blizzard_PlayerChoice.lua +++ b/Skin/Interface/AddOns/Blizzard_PlayerChoice.lua @@ -102,7 +102,7 @@ function private.AddOns.Blizzard_PlayerChoice() ----====####$$$$%%%%%$$$$####====---- -- Blizzard_PlayerChoice -- ----====####$$$$%%%%%$$$$####====---- - local PlayerChoiceFrame = _G.PlayerChoiceFrame + -- local PlayerChoiceFrame = _G.PlayerChoiceFrame -- Util.Mixin(PlayerChoiceFrame, Hook.PlayerChoiceFrameMixin) -- Skin.NineSlicePanelTemplate(PlayerChoiceFrame.NineSlice) -- PlayerChoiceFrame.BlackBackground:SetAllPoints(PlayerChoiceFrame.NineSlice) diff --git a/Skin/Interface/FrameXML/ColorPickerFrame.lua b/Skin/Interface/FrameXML/ColorPickerFrame.lua index ef5cbf94..ee217036 100644 --- a/Skin/Interface/FrameXML/ColorPickerFrame.lua +++ b/Skin/Interface/FrameXML/ColorPickerFrame.lua @@ -77,7 +77,6 @@ function private.FrameXML.ColorPickerFrame() -- ---------------------- -- OpacitySliderFrame has been removed -- ---------------------- - -- Skin.OpacitySlider(_G.OpacitySliderFrame) -- ------------------ diff --git a/Skin/Interface/FrameXML/LFGFrame.lua b/Skin/Interface/FrameXML/LFGFrame.lua index ba68bf12..db9bcc7e 100644 --- a/Skin/Interface/FrameXML/LFGFrame.lua +++ b/Skin/Interface/FrameXML/LFGFrame.lua @@ -13,10 +13,10 @@ local Hook, Skin = Aurora.Hook, Aurora.Skin local Color, Util = Aurora.Color, Aurora.Util local LFGRoleEnumToString = { - [Enum.LFGRole.Tank] = "TANK", - [Enum.LFGRole.Healer] = "HEALER", - [Enum.LFGRole.Damage] = "DAMAGER", - [Constants.LFG_ROLEConstants.LFG_ROLE_NO_ROLE] = "GUIDE" + [_G.Enum.LFGRole.Tank] = "TANK", + [_G.Enum.LFGRole.Healer] = "HEALER", + [_G.Enum.LFGRole.Damage] = "DAMAGER", + [_G.Constants.LFG_ROLEConstants.LFG_ROLE_NO_ROLE] = "GUIDE" } do @@ -41,7 +41,7 @@ do --When the group doesn't require a role (like scenarios and legacy raids), we get "NONE" as the role if role == "NONE" then - role = Enum.LFGRole.Damage + role = _G.Enum.LFGRole.Damage end if not hasResponded then diff --git a/Skin/Interface/FrameXML/LFGList.lua b/Skin/Interface/FrameXML/LFGList.lua index 0e971c82..f555b61a 100644 --- a/Skin/Interface/FrameXML/LFGList.lua +++ b/Skin/Interface/FrameXML/LFGList.lua @@ -131,7 +131,7 @@ do --[[ FrameXML\LFGList.lua ]] local searchResultInfo = _G.C_LFGList.GetSearchResultInfo(resultID) local activityInfo = _G.C_LFGList.GetActivityInfoTable(searchResultInfo.activityID) if activityInfo.displayType ~= _G.Enum.LFGListDisplayType.ClassEnumerate then return end - if searchResultInfo.isDelisted or not tooltip:IsShown() then + if searchResultInfo.isDelisted or not tooltip:IsShown() then -- _G.print("LFGListUtil_SetSearchEntryTooltip is isDelisted or not shown.") return end diff --git a/Skin/Interface/FrameXML/ReadyCheck.lua b/Skin/Interface/FrameXML/ReadyCheck.lua index f487241a..9b2a38f6 100644 --- a/Skin/Interface/FrameXML/ReadyCheck.lua +++ b/Skin/Interface/FrameXML/ReadyCheck.lua @@ -20,5 +20,4 @@ function private.FrameXML.ReadyCheck() _G.ReadyCheckFrameYesButton:SetPoint("TOPRIGHT", -184, -55) Skin.UIPanelButtonTemplate(_G.ReadyCheckFrameNoButton) _G.ReadyCheckFrameNoButton:SetPoint("TOPLEFT", 184, -55) - end diff --git a/Skin/Interface/FrameXML/RolePoll.lua b/Skin/Interface/FrameXML/RolePoll.lua index b6b50aca..09de1f5d 100644 --- a/Skin/Interface/FrameXML/RolePoll.lua +++ b/Skin/Interface/FrameXML/RolePoll.lua @@ -26,8 +26,8 @@ end function private.FrameXML.RolePoll() Skin.DialogBorderTemplate(_G.RolePollPopup.Border) Skin.UIPanelCloseButton(_G.RolePollPopupCloseButton) - Skin.LFGRoleButtonTemplate(RolePollPopupRoleButtonTank) - Skin.LFGRoleButtonTemplate(RolePollPopupRoleButtonHealer) - Skin.LFGRoleButtonTemplate(RolePollPopupRoleButtonDPS) - Skin.UIPanelButtonTemplate(RolePollPopupAcceptButton) + Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonTank) + Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonHealer) + Skin.LFGRoleButtonTemplate(_G.RolePollPopupRoleButtonDPS) + Skin.UIPanelButtonTemplate(_G.RolePollPopupAcceptButton) end diff --git a/Skin/Interface/SharedXML/AddonList.lua b/Skin/Interface/SharedXML/AddonList.lua index bd9720af..601c6215 100644 --- a/Skin/Interface/SharedXML/AddonList.lua +++ b/Skin/Interface/SharedXML/AddonList.lua @@ -7,7 +7,8 @@ if private.shouldSkip() then return end --[[ Core ]] local Aurora = private.Aurora local Hook, Skin = Aurora.Hook, Aurora.Skin -local Color, Util = Aurora.Color, Aurora.Util +local Util = Aurora.Util +-- local Color = Aurora.Color do --[[ SharedXML\AddonList.lua ]] function Hook.AddonListCharacterDropDownButton_OnClick(self)