From d33c274c731df903ad0692d9a0a1fa58a1439a06 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 13 Oct 2020 12:02:45 -0400 Subject: [PATCH] cache for stuff --- ElvUI/Core/API.lua | 1 - ElvUI/Core/Commands.lua | 2 +- ElvUI/Core/Core.lua | 1 - ElvUI/Modules/Auras/Auras.lua | 2 +- ElvUI/Modules/DataBars/DataBars.lua | 1 + .../Nameplates/Elements/WidgetContainer.lua | 1 + ElvUI/Modules/Nameplates/Nameplates.lua | 2 +- .../Modules/Skins/Blizzard/AnimaDiversion.lua | 1 - ElvUI/Modules/Skins/Blizzard/Calendar.lua | 1 - .../Skins/Blizzard/CovenantPreview.lua | 3 -- .../Skins/Blizzard/CovenantSanctum.lua | 2 -- .../Skins/Blizzard/EncounterJournal.lua | 30 ++++++++++--------- ElvUI/Modules/Skins/Blizzard/Garrison.lua | 1 - ElvUI/Modules/Skins/Blizzard/Gossip.lua | 2 +- ElvUI/Modules/Skins/Blizzard/GuildBank.lua | 2 -- ElvUI/Modules/Skins/Blizzard/Help.lua | 2 -- ElvUI/Modules/Skins/Blizzard/Merchant.lua | 1 - ElvUI/Modules/Skins/Blizzard/Misc.lua | 1 + ElvUI/Modules/Skins/Blizzard/Runeforge.lua | 8 ++--- .../Skins/Blizzard/ScrappingMachine.lua | 2 -- ElvUI/Modules/Skins/Blizzard/Trade.lua | 1 - .../Modules/Skins/Blizzard/WeeklyRewards.lua | 2 +- .../Modules/UnitFrames/Elements/AltPower.lua | 1 + .../UnitFrames/Elements/PhaseIndicator.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Arena.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Assist.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Boss.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Party.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Raid.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Raid40.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/RaidPets.lua | 3 +- ElvUI/Modules/UnitFrames/Groups/Tank.lua | 3 +- ElvUI/Modules/UnitFrames/Units/Focus.lua | 3 +- .../Modules/UnitFrames/Units/FocusTarget.lua | 3 +- ElvUI/Modules/UnitFrames/Units/Pet.lua | 3 +- ElvUI/Modules/UnitFrames/Units/PetTarget.lua | 3 +- ElvUI/Modules/UnitFrames/Units/Player.lua | 3 +- ElvUI/Modules/UnitFrames/Units/Target.lua | 3 +- .../Modules/UnitFrames/Units/TargetTarget.lua | 3 +- .../UnitFrames/Units/TargetTargetTarget.lua | 3 +- ElvUI_OptionsUI/DataBars.lua | 2 ++ ElvUI_OptionsUI/DataTexts.lua | 5 ++-- ElvUI_OptionsUI/Skins.lua | 1 - 43 files changed, 66 insertions(+), 63 deletions(-) diff --git a/ElvUI/Core/API.lua b/ElvUI/Core/API.lua index c542ee232..e83c69bdd 100644 --- a/ElvUI/Core/API.lua +++ b/ElvUI/Core/API.lua @@ -30,7 +30,6 @@ local UnitIsMercenary = UnitIsMercenary local UnitStat = UnitStat local C_PetBattles_IsInBattle = C_PetBattles.IsInBattle local C_PvP_IsRatedBattleground = C_PvP.IsRatedBattleground -local C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo = C_UIWidgetManager.GetStatusBarWidgetVisualizationInfo local FACTION_HORDE = FACTION_HORDE local FACTION_ALLIANCE = FACTION_ALLIANCE local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT diff --git a/ElvUI/Core/Commands.lua b/ElvUI/Core/Commands.lua index caa0b19d8..dec4d65e2 100644 --- a/ElvUI/Core/Commands.lua +++ b/ElvUI/Core/Commands.lua @@ -19,9 +19,9 @@ local GetNumGuildMembers = GetNumGuildMembers local GuildControlGetNumRanks = GuildControlGetNumRanks local GuildControlGetRankName = GuildControlGetRankName local GuildUninvite = GuildUninvite -local ReloadUI = ReloadUI local ResetCPUUsage = ResetCPUUsage local SendChatMessage = SendChatMessage +local ReloadUI = ReloadUI local SetCVar = SetCVar local UpdateAddOnCPUUsage = UpdateAddOnCPUUsage -- GLOBALS: ElvUIGrid, ElvDB diff --git a/ElvUI/Core/Core.lua b/ElvUI/Core/Core.lua index 5e1f72715..6ea701061 100644 --- a/ElvUI/Core/Core.lua +++ b/ElvUI/Core/Core.lua @@ -12,7 +12,6 @@ local rawget, rawset, setmetatable = rawget, rawset, setmetatable local CreateFrame = CreateFrame local GetCVar = GetCVar local GetCVarBool = GetCVarBool -local GetSpellInfo = GetSpellInfo local GetNumGroupMembers = GetNumGroupMembers local GetSpecialization = GetSpecialization local hooksecurefunc = hooksecurefunc diff --git a/ElvUI/Modules/Auras/Auras.lua b/ElvUI/Modules/Auras/Auras.lua index 7ac3fe18c..52eb396f6 100644 --- a/ElvUI/Modules/Auras/Auras.lua +++ b/ElvUI/Modules/Auras/Auras.lua @@ -5,13 +5,13 @@ local LSM = E.Libs.LSM local _G = _G local floor, format, tinsert = floor, format, tinsert local select, unpack, strmatch = select, unpack, strmatch -local CreateFrame = CreateFrame local GetInventoryItemQuality = GetInventoryItemQuality local GetInventoryItemTexture = GetInventoryItemTexture local GetItemQualityColor = GetItemQualityColor local GetWeaponEnchantInfo = GetWeaponEnchantInfo local RegisterAttributeDriver = RegisterAttributeDriver local RegisterStateDriver = RegisterStateDriver +local CreateFrame = CreateFrame local UnitAura = UnitAura local GetTime = GetTime diff --git a/ElvUI/Modules/DataBars/DataBars.lua b/ElvUI/Modules/DataBars/DataBars.lua index 6dc08fed3..f489da3b2 100644 --- a/ElvUI/Modules/DataBars/DataBars.lua +++ b/ElvUI/Modules/DataBars/DataBars.lua @@ -3,6 +3,7 @@ local DB = E:GetModule('DataBars') local LSM = E.Libs.LSM local _G = _G +local unpack = unpack local pairs, select = pairs, select local CreateFrame = CreateFrame local GetInstanceInfo = GetInstanceInfo diff --git a/ElvUI/Modules/Nameplates/Elements/WidgetContainer.lua b/ElvUI/Modules/Nameplates/Elements/WidgetContainer.lua index 229e7e867..db4f206ca 100644 --- a/ElvUI/Modules/Nameplates/Elements/WidgetContainer.lua +++ b/ElvUI/Modules/Nameplates/Elements/WidgetContainer.lua @@ -2,6 +2,7 @@ local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateD local NP = E:GetModule('NamePlates') local ipairs = ipairs +local CreateFrame = CreateFrame local UIWidgetSetLayoutDirection = Enum.UIWidgetSetLayoutDirection local UIWidgetLayoutDirection = Enum.UIWidgetLayoutDirection diff --git a/ElvUI/Modules/Nameplates/Nameplates.lua b/ElvUI/Modules/Nameplates/Nameplates.lua index bbccd5b84..80e271fc8 100644 --- a/ElvUI/Modules/Nameplates/Nameplates.lua +++ b/ElvUI/Modules/Nameplates/Nameplates.lua @@ -7,7 +7,7 @@ assert(ElvUF, 'ElvUI was unable to locate oUF.') local _G = _G local pairs, ipairs, wipe, tinsert = pairs, ipairs, wipe, tinsert -local format, select, strsplit = format, select, strsplit +local format, select, strsplit, tostring = format, select, strsplit, tostring local CreateFrame = CreateFrame local GetCVar = GetCVar diff --git a/ElvUI/Modules/Skins/Blizzard/AnimaDiversion.lua b/ElvUI/Modules/Skins/Blizzard/AnimaDiversion.lua index 59049f241..d93928e84 100644 --- a/ElvUI/Modules/Skins/Blizzard/AnimaDiversion.lua +++ b/ElvUI/Modules/Skins/Blizzard/AnimaDiversion.lua @@ -4,7 +4,6 @@ local S = E:GetModule('Skins') local _G = _G local hooksecurefunc = hooksecurefunc --- SHADOWLANDS function S:Blizzard_AnimaDiversionUI() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.animaDiversion) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/Calendar.lua b/ElvUI/Modules/Skins/Blizzard/Calendar.lua index 95c7f3e0c..49d897c57 100644 --- a/ElvUI/Modules/Skins/Blizzard/Calendar.lua +++ b/ElvUI/Modules/Skins/Blizzard/Calendar.lua @@ -6,7 +6,6 @@ local ipairs, select, unpack = ipairs, select, unpack local CLASS_SORT_ORDER = CLASS_SORT_ORDER local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS -local CreateFrame = CreateFrame local hooksecurefunc = hooksecurefunc function S:Blizzard_Calendar() diff --git a/ElvUI/Modules/Skins/Blizzard/CovenantPreview.lua b/ElvUI/Modules/Skins/Blizzard/CovenantPreview.lua index d95729f6f..1dde40b63 100644 --- a/ElvUI/Modules/Skins/Blizzard/CovenantPreview.lua +++ b/ElvUI/Modules/Skins/Blizzard/CovenantPreview.lua @@ -3,9 +3,6 @@ local S = E:GetModule('Skins') local _G = _G local hooksecurefunc = hooksecurefunc -local CreateFrame = CreateFrame - --- 9.0 SHADOWLANDS function S:Blizzard_CovenantPreviewUI() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.covenantPreview) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/CovenantSanctum.lua b/ElvUI/Modules/Skins/Blizzard/CovenantSanctum.lua index 1ab435fea..d9272180f 100644 --- a/ElvUI/Modules/Skins/Blizzard/CovenantSanctum.lua +++ b/ElvUI/Modules/Skins/Blizzard/CovenantSanctum.lua @@ -5,8 +5,6 @@ local _G = _G local gsub, ipairs = gsub, ipairs local hooksecurefunc = hooksecurefunc --- 9.0 SHADOWLANDS - local function HandleIconString(self, text) if not text then text = self:GetText() end if not text or text == '' then return end diff --git a/ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua b/ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua index 38f235b43..cf2a239f5 100644 --- a/ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua +++ b/ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua @@ -14,6 +14,8 @@ local GetItemInfo = GetItemInfo local GetItemQualityColor = GetItemQualityColor local hooksecurefunc = hooksecurefunc +local LEGENDARY_COLOR = Enum.ItemQuality.Legendary or 5 + local function HandleButton(btn, ...) S:HandleButton(btn, ...) if btn:GetFontString() then @@ -493,23 +495,23 @@ function S:Blizzard_EncounterJournal() S:HandleScrollBar(LootJournal.PowersFrame.ScrollBar) - local IconColor = E.QualityColors[Enum.ItemQuality.Legendary or 5] -- legendary color - hooksecurefunc(LootJournal.PowersFrame, "RefreshListDisplay", function(button) - if not button.elements then return end + local IconColor = E.QualityColors[LEGENDARY_COLOR] + hooksecurefunc(LootJournal.PowersFrame, "RefreshListDisplay", function(buttons) + if not buttons.elements then return end - for i = 1, button:GetNumElementFrames() do - local button = button.elements[i] - if button and not button.IsSkinned then - button.Background:SetAlpha(0) - button.CircleMask:Hide() - S:HandleIcon(button.Icon, true) - button.Icon.backdrop:SetBackdropBorderColor(IconColor.r, IconColor.g, IconColor.b) + for i = 1, buttons:GetNumElementFrames() do + local btn = buttons.elements[i] + if btn and not btn.IsSkinned then + btn.Background:SetAlpha(0) + btn.CircleMask:Hide() + S:HandleIcon(btn.Icon, true) + btn.Icon.backdrop:SetBackdropBorderColor(IconColor.r, IconColor.g, IconColor.b) - button:CreateBackdrop('Transparent') - button.backdrop:Point('TOPLEFT', 3, 0) - button.backdrop:Point('BOTTOMRIGHT', -2, 1) + btn:CreateBackdrop('Transparent') + btn.backdrop:Point('TOPLEFT', 3, 0) + btn.backdrop:Point('BOTTOMRIGHT', -2, 1) - button.IsSkinned = true + btn.IsSkinned = true end end end) diff --git a/ElvUI/Modules/Skins/Blizzard/Garrison.lua b/ElvUI/Modules/Skins/Blizzard/Garrison.lua index df5deabe8..3a2ad10fa 100644 --- a/ElvUI/Modules/Skins/Blizzard/Garrison.lua +++ b/ElvUI/Modules/Skins/Blizzard/Garrison.lua @@ -6,7 +6,6 @@ local unpack, pairs, ipairs, select = unpack, pairs, ipairs, select local CreateFrame = CreateFrame local hooksecurefunc = hooksecurefunc -local IsAddOnLoaded = IsAddOnLoaded local function showFollower(s) S:HandleFollowerAbilities(s) diff --git a/ElvUI/Modules/Skins/Blizzard/Gossip.lua b/ElvUI/Modules/Skins/Blizzard/Gossip.lua index ce192616a..0c70a121c 100644 --- a/ElvUI/Modules/Skins/Blizzard/Gossip.lua +++ b/ElvUI/Modules/Skins/Blizzard/Gossip.lua @@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private local S = E:GetModule('Skins') local _G = _G -local pairs = pairs +local next, pairs, ipairs = next, pairs, ipairs local hooksecurefunc = hooksecurefunc local function handleGossipText() diff --git a/ElvUI/Modules/Skins/Blizzard/GuildBank.lua b/ElvUI/Modules/Skins/Blizzard/GuildBank.lua index 7bfa9bcfa..42501e341 100644 --- a/ElvUI/Modules/Skins/Blizzard/GuildBank.lua +++ b/ElvUI/Modules/Skins/Blizzard/GuildBank.lua @@ -3,9 +3,7 @@ local S = E:GetModule('Skins') local _G = _G local select, unpack = select, unpack - local CreateFrame = CreateFrame -local hooksecurefunc = hooksecurefunc function S:Blizzard_GuildBankUI() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.gbank) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/Help.lua b/ElvUI/Modules/Skins/Blizzard/Help.lua index 5f4d56efe..23f82493f 100644 --- a/ElvUI/Modules/Skins/Blizzard/Help.lua +++ b/ElvUI/Modules/Skins/Blizzard/Help.lua @@ -2,8 +2,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private local S = E:GetModule('Skins') local _G = _G -local select, unpack = select, unpack - function S:HelpFrame() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.help) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/Merchant.lua b/ElvUI/Modules/Skins/Blizzard/Merchant.lua index c71f7aac4..43e354339 100644 --- a/ElvUI/Modules/Skins/Blizzard/Merchant.lua +++ b/ElvUI/Modules/Skins/Blizzard/Merchant.lua @@ -3,7 +3,6 @@ local S = E:GetModule('Skins') local _G = _G local unpack = unpack -local hooksecurefunc = hooksecurefunc function S:MerchantFrame() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.merchant) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua index ecc7bd4b4..d8da8f2cd 100644 --- a/ElvUI/Modules/Skins/Blizzard/Misc.lua +++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua @@ -3,6 +3,7 @@ local S = E:GetModule('Skins') local _G = _G local pairs = pairs +local ipairs = ipairs local unpack = unpack local hooksecurefunc = hooksecurefunc diff --git a/ElvUI/Modules/Skins/Blizzard/Runeforge.lua b/ElvUI/Modules/Skins/Blizzard/Runeforge.lua index 4356a67d5..7f0e0f902 100644 --- a/ElvUI/Modules/Skins/Blizzard/Runeforge.lua +++ b/ElvUI/Modules/Skins/Blizzard/Runeforge.lua @@ -19,11 +19,11 @@ function S:Blizzard_RuneforgeUI() S:HandleNextPrevButton(pageControl.BackwardButton) S:HandleNextPrevButton(pageControl.ForwardButton) - hooksecurefunc(powerFrame.PowerList, 'RefreshListDisplay', function(self) - if not self.elements then return end + hooksecurefunc(powerFrame.PowerList, 'RefreshListDisplay', function(list) + if not list.elements then return end - for i = 1, self:GetNumElementFrames() do - local button = self.elements[i] + for i = 1, list:GetNumElementFrames() do + local button = list.elements[i] if button and not button.IsSkinned then button.Border:SetAlpha(0) button.CircleMask:Hide() diff --git a/ElvUI/Modules/Skins/Blizzard/ScrappingMachine.lua b/ElvUI/Modules/Skins/Blizzard/ScrappingMachine.lua index c3438b06d..8f5f79afe 100644 --- a/ElvUI/Modules/Skins/Blizzard/ScrappingMachine.lua +++ b/ElvUI/Modules/Skins/Blizzard/ScrappingMachine.lua @@ -3,8 +3,6 @@ local S = E:GetModule('Skins') local _G = _G local pairs = pairs -local unpack = unpack -local hooksecurefunc = hooksecurefunc function S:Blizzard_ScrappingMachineUI() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.scrapping) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/Trade.lua b/ElvUI/Modules/Skins/Blizzard/Trade.lua index 236185c63..b2d58e0be 100644 --- a/ElvUI/Modules/Skins/Blizzard/Trade.lua +++ b/ElvUI/Modules/Skins/Blizzard/Trade.lua @@ -4,7 +4,6 @@ local S = E:GetModule('Skins') local _G = _G local unpack = unpack local CreateFrame = CreateFrame -local hooksecurefunc = hooksecurefunc function S:TradeFrame() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.trade) then return end diff --git a/ElvUI/Modules/Skins/Blizzard/WeeklyRewards.lua b/ElvUI/Modules/Skins/Blizzard/WeeklyRewards.lua index 3b3dd7b0f..e176f83a9 100644 --- a/ElvUI/Modules/Skins/Blizzard/WeeklyRewards.lua +++ b/ElvUI/Modules/Skins/Blizzard/WeeklyRewards.lua @@ -7,7 +7,7 @@ local hooksecurefunc = hooksecurefunc -- Credits Siweia | AuroraClassic -local function UpdateSelection(frame, state) +local function UpdateSelection(frame) if not frame.backdrop then return end if frame.SelectedTexture:IsShown() then diff --git a/ElvUI/Modules/UnitFrames/Elements/AltPower.lua b/ElvUI/Modules/UnitFrames/Elements/AltPower.lua index 5877abf2b..487af06cd 100644 --- a/ElvUI/Modules/UnitFrames/Elements/AltPower.lua +++ b/ElvUI/Modules/UnitFrames/Elements/AltPower.lua @@ -2,6 +2,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private local UF = E:GetModule('UnitFrames'); local CreateFrame = CreateFrame + function UF:Construct_AltPowerBar(frame) local altpower = CreateFrame('StatusBar', '$parent_AlternativePower', frame) altpower:SetStatusBarTexture(E.media.blankTex) diff --git a/ElvUI/Modules/UnitFrames/Elements/PhaseIndicator.lua b/ElvUI/Modules/UnitFrames/Elements/PhaseIndicator.lua index 9e03f2ab9..882d01f5d 100644 --- a/ElvUI/Modules/UnitFrames/Elements/PhaseIndicator.lua +++ b/ElvUI/Modules/UnitFrames/Elements/PhaseIndicator.lua @@ -1,7 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') -local UnitPhaseReason = UnitPhaseReason local unpack = unpack local texCoords = { {1/128, 33/128, 1/64, 33/64}, diff --git a/ElvUI/Modules/UnitFrames/Groups/Arena.lua b/ElvUI/Modules/UnitFrames/Groups/Arena.lua index f33ff9918..2f0eb79e8 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Arena.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Arena.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Assist.lua b/ElvUI/Modules/UnitFrames/Groups/Assist.lua index cca87fb15..fd108b9eb 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Assist.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Assist.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Boss.lua b/ElvUI/Modules/UnitFrames/Groups/Boss.lua index 516d29609..2a47ee0e9 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Boss.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Boss.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Party.lua b/ElvUI/Modules/UnitFrames/Groups/Party.lua index bad5c6452..cc283d74f 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Party.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Party.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid.lua b/ElvUI/Modules/UnitFrames/Groups/Raid.lua index 68a5b5274..4a3e7f602 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Raid.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Raid.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid40.lua b/ElvUI/Modules/UnitFrames/Groups/Raid40.lua index 13d2d1234..033770368 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Raid40.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Raid40.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/RaidPets.lua b/ElvUI/Modules/UnitFrames/Groups/RaidPets.lua index b95f8d08f..0fa4106f8 100644 --- a/ElvUI/Modules/UnitFrames/Groups/RaidPets.lua +++ b/ElvUI/Modules/UnitFrames/Groups/RaidPets.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Groups/Tank.lua b/ElvUI/Modules/UnitFrames/Groups/Tank.lua index b2ec0adf9..858b772de 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Tank.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Tank.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/Focus.lua b/ElvUI/Modules/UnitFrames/Units/Focus.lua index afd21fbd6..b5f47706e 100644 --- a/ElvUI/Modules/UnitFrames/Units/Focus.lua +++ b/ElvUI/Modules/UnitFrames/Units/Focus.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/FocusTarget.lua b/ElvUI/Modules/UnitFrames/Units/FocusTarget.lua index 36c80921c..cb097fdc5 100644 --- a/ElvUI/Modules/UnitFrames/Units/FocusTarget.lua +++ b/ElvUI/Modules/UnitFrames/Units/FocusTarget.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/Pet.lua b/ElvUI/Modules/UnitFrames/Units/Pet.lua index 17edd484f..9b539614b 100644 --- a/ElvUI/Modules/UnitFrames/Units/Pet.lua +++ b/ElvUI/Modules/UnitFrames/Units/Pet.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/PetTarget.lua b/ElvUI/Modules/UnitFrames/Units/PetTarget.lua index 8474984df..200ece188 100644 --- a/ElvUI/Modules/UnitFrames/Units/PetTarget.lua +++ b/ElvUI/Modules/UnitFrames/Units/PetTarget.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/Player.lua b/ElvUI/Modules/UnitFrames/Units/Player.lua index 6ab545f5b..44a929634 100644 --- a/ElvUI/Modules/UnitFrames/Units/Player.lua +++ b/ElvUI/Modules/UnitFrames/Units/Player.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/Target.lua b/ElvUI/Modules/UnitFrames/Units/Target.lua index 22fe1950b..ec71134e4 100644 --- a/ElvUI/Modules/UnitFrames/Units/Target.lua +++ b/ElvUI/Modules/UnitFrames/Units/Target.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/TargetTarget.lua b/ElvUI/Modules/UnitFrames/Units/TargetTarget.lua index dba92b76b..fd0d44100 100644 --- a/ElvUI/Modules/UnitFrames/Units/TargetTarget.lua +++ b/ElvUI/Modules/UnitFrames/Units/TargetTarget.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI/Modules/UnitFrames/Units/TargetTargetTarget.lua b/ElvUI/Modules/UnitFrames/Units/TargetTargetTarget.lua index 3b416a41e..48439774c 100644 --- a/ElvUI/Modules/UnitFrames/Units/TargetTargetTarget.lua +++ b/ElvUI/Modules/UnitFrames/Units/TargetTargetTarget.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local UF = E:GetModule('UnitFrames'); +local UF = E:GetModule('UnitFrames') + local _, ns = ... local ElvUF = ns.oUF assert(ElvUF, 'ElvUI was unable to locate oUF.') diff --git a/ElvUI_OptionsUI/DataBars.lua b/ElvUI_OptionsUI/DataBars.lua index f3e221f53..12668382e 100644 --- a/ElvUI_OptionsUI/DataBars.lua +++ b/ElvUI_OptionsUI/DataBars.lua @@ -3,6 +3,8 @@ local C, L = unpack(select(2, ...)) local DB = E:GetModule('DataBars') local ACH = E.Libs.ACH +local tonumber = tonumber + local SharedOptions = { enable = ACH:Toggle(L["Enable"], nil, 1), textFormat = ACH:Select(L["Text Format"], nil, 2, { NONE = L["NONE"], CUR = L["Current"], REM = L["Remaining"], PERCENT = L["Percent"], CURMAX = L["Current - Max"], CURPERC = L["Current - Percent"], CURREM = L["Current - Remaining"], CURPERCREM = L["Current - Percent (Remaining)"] }), diff --git a/ElvUI_OptionsUI/DataTexts.lua b/ElvUI_OptionsUI/DataTexts.lua index 48b6f2a18..7c54ad9ec 100644 --- a/ElvUI_OptionsUI/DataTexts.lua +++ b/ElvUI_OptionsUI/DataTexts.lua @@ -7,12 +7,11 @@ local Minimap = E:GetModule('Minimap') local ACH = E.Libs.ACH local _G = _G -local wipe = wipe +local type, pairs, ipairs = type, pairs, ipairs +local gsub, next, wipe = gsub, next, wipe local tonumber = tonumber local tostring = tostring local format = format -local pairs = pairs -local type = type -- GLOBALS: AceGUIWidgetLSMlists local currencyList = {} diff --git a/ElvUI_OptionsUI/Skins.lua b/ElvUI_OptionsUI/Skins.lua index 830af34b1..879d65950 100644 --- a/ElvUI_OptionsUI/Skins.lua +++ b/ElvUI_OptionsUI/Skins.lua @@ -1,6 +1,5 @@ local E, _, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local C, L = unpack(select(2, ...)) -local AB = E:GetModule('ActionBars') local B = E:GetModule('Blizzard') local ACH = E.Libs.ACH -- GitLab