From c60324af127c83edbe93fd283779cc931d334d34 Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Wed, 18 Jul 2018 15:06:20 +0300 Subject: [PATCH] cleanup --- ElvUI/Core/ClassCache.lua | 4 +- ElvUI/Core/StaticPopups.lua | 2 +- ElvUI/Core/core.lua | 3 - ElvUI/Core/pixelperfect.lua | 1 - ElvUI/Developer/Frame.lua | 6 +- ElvUI/Modules/ActionBars/ActionBars.lua | 2 +- ElvUI/Modules/ActionBars/BarShapeShift.lua | 5 +- ElvUI/Modules/ActionBars/Bind.lua | 2 +- ElvUI/Modules/Auras/Auras.lua | 1 - ElvUI/Modules/Bags/Bags.lua | 2 +- ElvUI/Modules/Bags/Sort.lua | 5 -- ElvUI/Modules/Blizzard/AlertFrame.lua | 14 +---- ElvUI/Modules/Blizzard/Blizzard.lua | 62 ------------------- ElvUI/Modules/Blizzard/CaptureBar.lua | 2 +- ElvUI/Modules/Blizzard/ColorPicker.lua | 4 +- ElvUI/Modules/Blizzard/Durablity.lua | 3 +- ElvUI/Modules/Blizzard/GM.lua | 6 +- ElvUI/Modules/Blizzard/WatchFrame.lua | 3 +- ElvUI/Modules/Chat/Chat.lua | 5 +- ElvUI/Modules/DataBars/Reputation.lua | 1 - ElvUI/Modules/DataTexts/Avoidance.lua | 1 - ElvUI/Modules/DataTexts/DataTexts.lua | 1 - ElvUI/Modules/DataTexts/Time.lua | 14 +---- ElvUI/Modules/Maps/Minimap.lua | 2 - ElvUI/Modules/Misc/Loot.lua | 2 - ElvUI/Modules/Misc/LootRoll.lua | 2 +- ElvUI/Modules/NamePlates/Elements/CastBar.lua | 2 +- .../Modules/NamePlates/Elements/HealthBar.lua | 3 +- ElvUI/Modules/NamePlates/NamePlates.lua | 10 ++- ElvUI/Modules/Skins/Blizzard/Craft.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Debug.lua | 3 - ElvUI/Modules/Skins/Blizzard/Friends.lua | 1 - ElvUI/Modules/Skins/Blizzard/Inspect.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Loot.lua | 1 - ElvUI/Modules/Skins/Blizzard/Mail.lua | 1 - ElvUI/Modules/Skins/Blizzard/Merchant.lua | 5 +- ElvUI/Modules/Skins/Blizzard/Misc.lua | 15 ++--- ElvUI/Modules/Skins/Blizzard/Quest.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Raid.lua | 1 - ElvUI/Modules/Skins/Blizzard/TradeSkill.lua | 2 +- ElvUI/Modules/Tooltip/Tooltip.lua | 2 - .../Modules/UnitFrames/Config_Enviroment.lua | 2 +- .../Modules/UnitFrames/Elements/AuraBars.lua | 1 - ElvUI/Modules/UnitFrames/Elements/Castbar.lua | 2 +- .../Modules/UnitFrames/Elements/FrameGlow.lua | 1 - ElvUI/Modules/UnitFrames/Groups/Party.lua | 2 - ElvUI/Modules/UnitFrames/Tags.lua | 1 - ElvUI/Modules/UnitFrames/UnitFrames.lua | 2 - ElvUI_Config/ActionBars.lua | 1 - ElvUI_Config/Nameplates.lua | 1 - ElvUI_Config/Tooltip.lua | 2 +- ElvUI_Config/UnitFrames.lua | 16 +---- 52 files changed, 48 insertions(+), 190 deletions(-) diff --git a/ElvUI/Core/ClassCache.lua b/ElvUI/Core/ClassCache.lua index 8f70b7c..b3b13ed 100644 --- a/ElvUI/Core/ClassCache.lua +++ b/ElvUI/Core/ClassCache.lua @@ -195,7 +195,7 @@ function CC:GetCacheSize(global) if global then for realm in pairs(self.cache) do - for name in pairs(self.cache[realm]) do + for _ in pairs(self.cache[realm]) do size = size + 1 end end @@ -204,7 +204,7 @@ function CC:GetCacheSize(global) self.cacheDBCalculationTime = GetTime() else for realm in pairs(self.tempCache) do - for name in pairs(self.tempCache[realm]) do + for _ in pairs(self.tempCache[realm]) do size = size + 1 end end diff --git a/ElvUI/Core/StaticPopups.lua b/ElvUI/Core/StaticPopups.lua index ae27dd7..a9b5d7a 100644 --- a/ElvUI/Core/StaticPopups.lua +++ b/ElvUI/Core/StaticPopups.lua @@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi --Cache global variables --Lua functions local _G = _G -local pairs, type, unpack, assert = pairs, type, unpack, assert +local pairs, assert = pairs, assert local getn, tremove, tContains, tinsert, wipe = table.getn, tremove, tContains, tinsert, table.wipe local lower = string.lower --WoW API / Variables diff --git a/ElvUI/Core/core.lua b/ElvUI/Core/core.lua index 898f3c6..4966189 100644 --- a/ElvUI/Core/core.lua +++ b/ElvUI/Core/core.lua @@ -11,7 +11,6 @@ local floor = floor local format, find, match, strrep, len, sub, gsub = string.format, string.find, string.match, strrep, string.len, string.sub, string.gsub --WoW API / Variables local CreateFrame = CreateFrame -local GetActiveTalentGroup = GetActiveTalentGroup local GetCVar = GetCVar local GetFunctionCPUUsage = GetFunctionCPUUsage local GetTalentTabInfo = GetTalentTabInfo @@ -20,8 +19,6 @@ local IsInInstance, GetNumPartyMembers, GetNumRaidMembers = IsInInstance, GetNum local RequestBattlefieldScoreData = RequestBattlefieldScoreData local SendAddonMessage = SendAddonMessage local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS -local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT -local MAX_TALENT_TABS = MAX_TALENT_TABS local RAID_CLASS_COLORS = RAID_CLASS_COLORS _, E.myclass = UnitClass("player") -- Constants diff --git a/ElvUI/Core/pixelperfect.lua b/ElvUI/Core/pixelperfect.lua index 3bd97fc..417111e 100644 --- a/ElvUI/Core/pixelperfect.lua +++ b/ElvUI/Core/pixelperfect.lua @@ -67,7 +67,6 @@ function E:UIScale(event) if E.Round and E:Round(UIParent:GetScale(), 5) ~= E:Round(scale, 5) and (event == "PLAYER_LOGIN") then SetCVar("UseUIScale", 1) SetCVar("UIScale", scale) - WorldMapFrame.hasTaint = true; end if (event == "PLAYER_LOGIN" or event == "UPDATE_FLOATING_CHAT_WINDOWS") then diff --git a/ElvUI/Developer/Frame.lua b/ElvUI/Developer/Frame.lua index 47eca20..22249d2 100644 --- a/ElvUI/Developer/Frame.lua +++ b/ElvUI/Developer/Frame.lua @@ -3,15 +3,14 @@ local _G = _G local print, tostring, select = print, tostring, select local format = format ---WoW API / Variables -local CreateFrame = CreateFrame + --WoW API / Variables local FrameStackTooltip_Toggle = FrameStackTooltip_Toggle local GetMouseFocus = GetMouseFocus local IsAddOnLoaded = IsAddOnLoaded -local LoadAddOn = LoadAddOn --[[ Command to grab frame information when mouseing over a frame + Frame Name Width Height @@ -29,7 +28,6 @@ SlashCmdList["FRAME"] = function(arg) else arg = GetMouseFocus() end - if arg ~= nil then FRAME = arg end --Set the global variable FRAME to = whatever we are mousing over to simplify messing with frames that have no name. if arg ~= nil and arg:GetName() ~= nil then local point, relativeTo, relativePoint, xOfs, yOfs = arg:GetPoint() diff --git a/ElvUI/Modules/ActionBars/ActionBars.lua b/ElvUI/Modules/ActionBars/ActionBars.lua index 08519b7..e31292b 100644 --- a/ElvUI/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Modules/ActionBars/ActionBars.lua @@ -448,8 +448,8 @@ end local function IsInShapeshiftForm() for i = 1, GetNumShapeshiftForms() do - local texture, _, active = GetShapeshiftFormInfo(i) if i ~= 5 and active ~= nil then + local _, _, active = GetShapeshiftFormInfo(i) return true end end diff --git a/ElvUI/Modules/ActionBars/BarShapeShift.lua b/ElvUI/Modules/ActionBars/BarShapeShift.lua index f03740e..4164a15 100644 --- a/ElvUI/Modules/ActionBars/BarShapeShift.lua +++ b/ElvUI/Modules/ActionBars/BarShapeShift.lua @@ -7,11 +7,9 @@ local _G = _G local ceil, mod = math.ceil, math.mod --WoW API / Variables local CreateFrame = CreateFrame -local GetShapeshiftForm = GetShapeshiftForm local GetNumShapeshiftForms = GetNumShapeshiftForms local GetShapeshiftFormCooldown = GetShapeshiftFormCooldown local GetShapeshiftFormInfo = GetShapeshiftFormInfo -local GetSpellTexture = GetSpellTexture local GetBindingKey = GetBindingKey local NUM_SHAPESHIFT_SLOTS = NUM_SHAPESHIFT_SLOTS @@ -32,9 +30,8 @@ function AB:SPELL_UPDATE_COOLDOWN() end function AB:StyleShapeShift() - local numForms = GetNumShapeshiftForms() - local texture, name, isActive, isCastable, _ local buttonName, button, icon, cooldown + local texture, name, isActive, isCastable, _ local numForms = GetNumShapeshiftForms() for i = 1, NUM_SHAPESHIFT_SLOTS do diff --git a/ElvUI/Modules/ActionBars/Bind.lua b/ElvUI/Modules/ActionBars/Bind.lua index 1062cc9..f01fd08 100644 --- a/ElvUI/Modules/ActionBars/Bind.lua +++ b/ElvUI/Modules/ActionBars/Bind.lua @@ -5,7 +5,7 @@ local AB = E:GetModule("ActionBars"); --Lua functions local _G = _G local find, format, upper, sub = string.find, string.format, string.upper, string.sub -local floor, mod = math.floor, math.mod +local floor = math.floor local select, tonumber, pairs, getn = select, tonumber, pairs, getn --WoW API / Variables local CreateFrame = CreateFrame diff --git a/ElvUI/Modules/Auras/Auras.lua b/ElvUI/Modules/Auras/Auras.lua index 7eefce7..5d27cd3 100644 --- a/ElvUI/Modules/Auras/Auras.lua +++ b/ElvUI/Modules/Auras/Auras.lua @@ -4,7 +4,6 @@ local LSM = LibStub("LibSharedMedia-3.0"); --Cache global variables --Lua functions -local GetTime = GetTime local _G = _G local unpack, select, pairs, ipairs = unpack, select, pairs, ipairs local floor, min, max, huge = math.floor, math.min, math.max, math.huge diff --git a/ElvUI/Modules/Bags/Bags.lua b/ElvUI/Modules/Bags/Bags.lua index e3d7a31..696b143 100644 --- a/ElvUI/Modules/Bags/Bags.lua +++ b/ElvUI/Modules/Bags/Bags.lua @@ -8,7 +8,7 @@ local LIP = LibStub("ItemPrice-1.1", true); local _G = _G local type, ipairs, pairs, unpack, select, assert, pcall = type, ipairs, pairs, unpack, select, assert, pcall local tinsert = table.insert -local floor, ceil = math.floor, math.ceil +local floor = math.floor local len, gsub, sub, find, match = string.len, string.gsub, string.sub, string.find, string.match --WoW API / Variables local BankFrameItemButton_OnUpdate = BankFrameItemButton_OnUpdate diff --git a/ElvUI/Modules/Bags/Sort.lua b/ElvUI/Modules/Bags/Sort.lua index be2abf7..105e845 100644 --- a/ElvUI/Modules/Bags/Sort.lua +++ b/ElvUI/Modules/Bags/Sort.lua @@ -19,7 +19,6 @@ local GetContainerItemLink = GetContainerItemLink local PickupContainerItem = PickupContainerItem local SplitContainerItem = SplitContainerItem local GetContainerNumSlots = GetContainerNumSlots -local GetContainerNumFreeSlots = GetContainerNumFreeSlots local ContainerIDToInventoryID = ContainerIDToInventoryID local GetInventoryItemLink = GetInventoryItemLink local CursorHasItem = CursorHasItem @@ -60,7 +59,6 @@ local bagGroups = {} local initialOrder = {} local itemTypes, itemSubTypes local bagSorted, bagLocked = {}, {} -local bagRole local moves = {} local targetItems = {} local sourceUsed = {} @@ -254,7 +252,6 @@ local function IterateForwards(bagList, i) end end end - bagRole = nil end local function IterateBackwards(bagList, i) @@ -274,11 +271,9 @@ local function IterateBackwards(bagList, i) end end end - bagRole = nil end function B.IterateBags(bagList, reverse, role) - bagRole = role return (reverse and IterateBackwards or IterateForwards), bagList, 0 end diff --git a/ElvUI/Modules/Blizzard/AlertFrame.lua b/ElvUI/Modules/Blizzard/AlertFrame.lua index 827be95..b36eb36 100644 --- a/ElvUI/Modules/Blizzard/AlertFrame.lua +++ b/ElvUI/Modules/Blizzard/AlertFrame.lua @@ -1,4 +1,4 @@ -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); --Cache global variables @@ -27,7 +27,7 @@ function E:PostAlertMove() local rollBars = E:GetModule("Misc").RollBars if E.private.general.lootRoll then - local lastframe, lastShownFrame + local lastframe for i, frame in pairs(rollBars) do frame:ClearAllPoints() if i ~= 1 then @@ -44,13 +44,9 @@ function E:PostAlertMove() end end lastframe = frame - - if frame:IsShown() then - lastShownFrame = frame - end end elseif E.private.skins.blizzard.enable and E.private.skins.blizzard.lootRoll then - local lastframe, lastShownFrame + local lastframe for i = 1, NUM_GROUP_LOOT_FRAMES do local frame = _G["GroupLootFrame" .. i] if frame then @@ -69,10 +65,6 @@ function E:PostAlertMove() end end lastframe = frame - - if frame:IsShown() then - lastShownFrame = frame - end end end end diff --git a/ElvUI/Modules/Blizzard/Blizzard.lua b/ElvUI/Modules/Blizzard/Blizzard.lua index bf8d99e..7d90077 100644 --- a/ElvUI/Modules/Blizzard/Blizzard.lua +++ b/ElvUI/Modules/Blizzard/Blizzard.lua @@ -1,77 +1,15 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:NewModule("Blizzard", "AceEvent-3.0", "AceHook-3.0"); -local GetNumQuestChoices = GetNumQuestChoices -local GetNumQuestLogChoices = GetNumQuestLogChoices -local GetQuestLogRewardHonor = GetQuestLogRewardHonor -local GetQuestLogRewardMoney = GetQuestLogRewardMoney -local GetQuestLogRewardSpell = GetQuestLogRewardSpell -local GetRewardHonor = GetRewardHonor -local GetRewardMoney = GetRewardMoney -local GetRewardSpell = GetRewardSpell - E.Blizzard = B function B:Initialize() self:AlertMovers() self:EnhanceColorPicker() - -- self:KillBlizzard() self:PositionCaptureBar() self:PositionDurabilityFrame() self:PositionGMFrames() self:MoveWatchFrame() - - --[[self:RawHook("CombatConfig_Colorize_Update", function() - if not CHATCONFIG_SELECTED_FILTER_SETTINGS then return end - self.hooks.CombatConfig_Colorize_Update() - end, true) - - hooksecurefunc("QuestFrameItems_Update", function(questState) - local spacerFrame, money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards - - if questState == "QuestLog" then - spacerFrame = QuestLogSpacerFrame - money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards = GetQuestLogRewardMoney(), GetQuestLogRewardHonor(), GetNumQuestLogRewards(), GetNumQuestLogChoices(), GetQuestLogRewardSpell() - else - spacerFrame = QuestSpacerFrame - money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards = GetRewardMoney(), GetRewardHonor(), GetNumQuestRewards(), GetNumQuestChoices(), GetRewardSpell() - end - - if money == 0 and honor > 0 and (numQuestRewards > 0 or numQuestChoices > 0 or numQuestSpellRewards) then - numQuestSpellRewards = numQuestSpellRewards and 1 or 0 - local rewardsCount = numQuestRewards + numQuestChoices + numQuestSpellRewards - local honorFrame = _G[questState.."HonorFrame"] - - if numQuestRewards > 0 then - honorFrame:ClearAllPoints() - honorFrame:SetPoint("TOPLEFT", questState.."Item"..rewardsCount, "BOTTOMLEFT", 3, 0) - - QuestFrame_SetAsLastShown(questState.."HonorFrame", spacerFrame) - else - local questItemReceiveText = _G[questState.."ItemReceiveText"] - honorFrame:ClearAllPoints() - honorFrame:SetPoint("TOPLEFT", questItemReceiveText, "BOTTOMLEFT", 0, -5) - - if numQuestSpellRewards > 0 then - questItemReceiveText:SetText(REWARD_ITEMS) - questItemReceiveText:SetPoint("TOPLEFT", questState.."Item"..rewardsCount, "BOTTOMLEFT", 3, 15) - elseif numQuestChoices > 0 then - questItemReceiveText:SetText(REWARD_ITEMS) - local index = numQuestChoices - if mod(index, 2) == 0 then - index = index - 1 - end - - questItemReceiveText:SetPoint("TOPLEFT", questState.."Item"..index, "BOTTOMLEFT", 3, 15) - else - questItemReceiveText:SetText(REWARD_ITEMS_ONLY) - questItemReceiveText:SetPoint("TOPLEFT", questState.."RewardTitleText", "BOTTOMLEFT", 3, 15) - end - - QuestFrame_SetAsLastShown(questItemReceiveText, spacerFrame) - end - end - end)--]] end local function InitializeCallback() diff --git a/ElvUI/Modules/Blizzard/CaptureBar.lua b/ElvUI/Modules/Blizzard/CaptureBar.lua index 93d45ca..820399d 100644 --- a/ElvUI/Modules/Blizzard/CaptureBar.lua +++ b/ElvUI/Modules/Blizzard/CaptureBar.lua @@ -1,4 +1,4 @@ -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); --Cache global variables diff --git a/ElvUI/Modules/Blizzard/ColorPicker.lua b/ElvUI/Modules/Blizzard/ColorPicker.lua index 8f518bb..4af5542 100644 --- a/ElvUI/Modules/Blizzard/ColorPicker.lua +++ b/ElvUI/Modules/Blizzard/ColorPicker.lua @@ -1,13 +1,13 @@ --[[ Credit to Jaslm, most of this code is his from the addon ColorPickerPlus ]] -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); local S = E:GetModule("Skins"); --Cache global variables --Lua functions -local tonumber, collectgarbage = tonumber, collectgarbage +local collectgarbage = collectgarbage local floor = math.floor local format = string.format --WoW API / Variables diff --git a/ElvUI/Modules/Blizzard/Durablity.lua b/ElvUI/Modules/Blizzard/Durablity.lua index 4cda740..0893273 100644 --- a/ElvUI/Modules/Blizzard/Durablity.lua +++ b/ElvUI/Modules/Blizzard/Durablity.lua @@ -1,10 +1,9 @@ -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); --Cache global variables --Lua functions local _G = _G ---WoW API / Variables function B:PositionDurabilityFrame() DurabilityFrame:SetFrameStrata("HIGH") diff --git a/ElvUI/Modules/Blizzard/GM.lua b/ElvUI/Modules/Blizzard/GM.lua index cd7e8d6..2e69d25 100644 --- a/ElvUI/Modules/Blizzard/GM.lua +++ b/ElvUI/Modules/Blizzard/GM.lua @@ -1,10 +1,6 @@ -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); ---Cache global variables ---Lua functions ---WoW API / Variables - function B:PositionGMFrames() TicketStatusFrame:ClearAllPoints() TicketStatusFrame:SetPoint("TOPLEFT", E.UIParent, "TOPLEFT", 250, -5) diff --git a/ElvUI/Modules/Blizzard/WatchFrame.lua b/ElvUI/Modules/Blizzard/WatchFrame.lua index 2498a3f..6831938 100644 --- a/ElvUI/Modules/Blizzard/WatchFrame.lua +++ b/ElvUI/Modules/Blizzard/WatchFrame.lua @@ -1,4 +1,4 @@ -local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local B = E:GetModule("Blizzard"); --Cache global variables @@ -6,7 +6,6 @@ local B = E:GetModule("Blizzard"); local min = math.min --WoW API / Variables local hooksecurefunc = hooksecurefunc -local GetScreenWidth = GetScreenWidth local GetScreenHeight = GetScreenHeight local WatchFrameHolder = CreateFrame("Frame", "WatchFrameHolder", E.UIParent) diff --git a/ElvUI/Modules/Chat/Chat.lua b/ElvUI/Modules/Chat/Chat.lua index 10a5e8e..2947717 100644 --- a/ElvUI/Modules/Chat/Chat.lua +++ b/ElvUI/Modules/Chat/Chat.lua @@ -667,7 +667,7 @@ function CH:ChatFrame_OnEvent(self, event, arg1, arg2, arg3, arg4, arg5, arg6, a if event == "UPDATE_CHAT_WINDOWS" then local _, fontSize, _, _, _, _, shown = GetChatWindowInfo(self:GetID()) if fontSize > 0 then - local fontFile, unused, fontFlags = self:GetFont() + local fontFile, _, fontFlags = self:GetFont() self:SetFont(fontFile, fontSize, fontFlags) end if shown then @@ -1028,7 +1028,8 @@ function CH:SetupChat() local editbox = _G["ChatFrameEditBox"] if not editbox.isSkinned then - local a, b, c = select(6, editbox:GetRegions()) E:Kill(a) E:Kill(b) E:Kill(c) + local a, b, c = select(6, editbox:GetRegions()) + E:Kill(a) E:Kill(b) E:Kill(c) E:SetTemplate(editbox, "Default", true) editbox:SetAltArrowKeyMode(CH.db.useAltKey) editbox:SetAllPoints(LeftChatDataPanel) diff --git a/ElvUI/Modules/DataBars/Reputation.lua b/ElvUI/Modules/DataBars/Reputation.lua index ab1ea43..64a1476 100644 --- a/ElvUI/Modules/DataBars/Reputation.lua +++ b/ElvUI/Modules/DataBars/Reputation.lua @@ -8,7 +8,6 @@ local _G = _G local format = format --WoW API / Variables local GetWatchedFactionInfo, GetNumFactions, GetFactionInfo = GetWatchedFactionInfo, GetNumFactions, GetFactionInfo -local InCombatLockdown = InCombatLockdown local FACTION_BAR_COLORS = FACTION_BAR_COLORS local REPUTATION, STANDING = REPUTATION, STANDING diff --git a/ElvUI/Modules/DataTexts/Avoidance.lua b/ElvUI/Modules/DataTexts/Avoidance.lua index d4bed30..1c35717 100644 --- a/ElvUI/Modules/DataTexts/Avoidance.lua +++ b/ElvUI/Modules/DataTexts/Avoidance.lua @@ -7,7 +7,6 @@ local format, join = string.format, string.join local abs = math.abs --WoW API / Variables local GetInventorySlotInfo = GetInventorySlotInfo -local GetInventoryItemID = GetInventoryItemID local GetItemInfo = GetItemInfo local UnitLevel = UnitLevel local GetDodgeChance = GetDodgeChance diff --git a/ElvUI/Modules/DataTexts/DataTexts.lua b/ElvUI/Modules/DataTexts/DataTexts.lua index 8c24001..eac20da 100644 --- a/ElvUI/Modules/DataTexts/DataTexts.lua +++ b/ElvUI/Modules/DataTexts/DataTexts.lua @@ -8,7 +8,6 @@ local pairs, type, error = pairs, type, error local len = string.len local CreateFrame = CreateFrame -local InCombatLockdown = InCombatLockdown local IsInInstance = IsInInstance function DT:Initialize() diff --git a/ElvUI/Modules/DataTexts/Time.lua b/ElvUI/Modules/DataTexts/Time.lua index 793ace9..3d3a8e6 100644 --- a/ElvUI/Modules/DataTexts/Time.lua +++ b/ElvUI/Modules/DataTexts/Time.lua @@ -4,10 +4,10 @@ local DT = E:GetModule("DataTexts"); --Cache global variables --Lua functions local next, unpack = next, unpack +local time = time local format, gsub, join = string.format, string.gsub, string.join local abs = math.abs -local getn, insert = table.getn, table.insert -local time, utf8sub = time, string.utf8sub +local getn, tinsert = table.getn, table.insert --WoW API / Variables local GetGameTime = GetGameTime local GetNumSavedInstances = GetNumSavedInstances @@ -46,7 +46,7 @@ local function OnEnter(self) for i = 1, GetNumSavedInstances() do name, _, reset = GetSavedInstanceInfo(i) if name then - insert(lockedInstances["raids"], {name, reset}) + tinsert(lockedInstances["raids"], {name, reset}) end end @@ -75,14 +75,6 @@ local function OnUpdate(self, t) if int > 0 then return end - if IsAddOnLoaded("TimeManager") then -- https://github.com/gashole/TimeManager - if TimeManagerClockButton.alarmFiring then - -- E:Flash(self) - else - -- E:StopFlash(self) - end - end - self.text:SetText(gsub(gsub(BetterDate(E.db.datatexts.timeFormat.." "..E.db.datatexts.dateFormat, time()), ":", timeDisplayFormat), "%s", dateDisplayFormat)) lastPanel = self diff --git a/ElvUI/Modules/Maps/Minimap.lua b/ElvUI/Modules/Maps/Minimap.lua index 3d320c6..12943ee 100644 --- a/ElvUI/Modules/Maps/Minimap.lua +++ b/ElvUI/Modules/Maps/Minimap.lua @@ -11,11 +11,9 @@ local CreateFrame = CreateFrame local ToggleCharacter = ToggleCharacter local ToggleFrame = ToggleFrame local ToggleFriendsFrame = ToggleFriendsFrame -local IsAddOnLoaded = IsAddOnLoaded local ToggleHelpFrame = ToggleHelpFrame local GetZonePVPInfo = GetZonePVPInfo local IsShiftKeyDown = IsShiftKeyDown -local ToggleDropDownMenu = ToggleDropDownMenu local Minimap_OnClick = Minimap_OnClick local GetMinimapZoneText = GetMinimapZoneText diff --git a/ElvUI/Modules/Misc/Loot.lua b/ElvUI/Modules/Misc/Loot.lua index 1b23d90..408d96f 100644 --- a/ElvUI/Modules/Misc/Loot.lua +++ b/ElvUI/Modules/Misc/Loot.lua @@ -11,10 +11,8 @@ local gsub = string.gsub local CloseLoot = CloseLoot local CursorOnUpdate = CursorOnUpdate local CursorUpdate = CursorUpdate -local GetCVar = GetCVar local GetCursorPosition = GetCursorPosition local GetLootSlotInfo = GetLootSlotInfo -local GetLootSlotLink = GetLootSlotLink local GetNumLootItems = GetNumLootItems local GiveMasterLoot = GiveMasterLoot local IsFishingLoot = IsFishingLoot diff --git a/ElvUI/Modules/Misc/LootRoll.lua b/ElvUI/Modules/Misc/LootRoll.lua index 2d3f59c..15e63f6 100644 --- a/ElvUI/Modules/Misc/LootRoll.lua +++ b/ElvUI/Modules/Misc/LootRoll.lua @@ -258,7 +258,7 @@ function M:START_LOOT_ROLL() f.greed:SetText(0) f.pass:SetText(0) - local texture, name, count, quality, bindOnPickUp = GetLootRollItemInfo(arg1) + local texture, name, _, quality, bindOnPickUp = GetLootRollItemInfo(arg1) f.button.icon:SetTexture(texture) f.button.link = GetLootRollItemLink(arg1) diff --git a/ElvUI/Modules/NamePlates/Elements/CastBar.lua b/ElvUI/Modules/NamePlates/Elements/CastBar.lua index a64f019..5d96753 100644 --- a/ElvUI/Modules/NamePlates/Elements/CastBar.lua +++ b/ElvUI/Modules/NamePlates/Elements/CastBar.lua @@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI) local mod = E:GetModule("NamePlates") local LSM = LibStub("LibSharedMedia-3.0") -local select, unpack = select, unpack +local unpack = unpack local CreateFrame = CreateFrame local GetTime = GetTime diff --git a/ElvUI/Modules/NamePlates/Elements/HealthBar.lua b/ElvUI/Modules/NamePlates/Elements/HealthBar.lua index 4419266..6c72a16 100644 --- a/ElvUI/Modules/NamePlates/Elements/HealthBar.lua +++ b/ElvUI/Modules/NamePlates/Elements/HealthBar.lua @@ -3,9 +3,8 @@ local mod = E:GetModule("NamePlates") local LSM = LibStub("LibSharedMedia-3.0") --local LMH = LibStub("LibMobHealth-4.0") -local tonumber = tonumber +--local tonumber = tonumber -local GetInstanceDifficulty = GetInstanceDifficulty local UnitLevel = UnitLevel function mod:UpdateElement_HealthOnValueChanged() diff --git a/ElvUI/Modules/NamePlates/NamePlates.lua b/ElvUI/Modules/NamePlates/NamePlates.lua index e8ecd21..9787880 100644 --- a/ElvUI/Modules/NamePlates/NamePlates.lua +++ b/ElvUI/Modules/NamePlates/NamePlates.lua @@ -1,6 +1,6 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local mod = E:NewModule("NamePlates", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0"); -local CC = E:GetModule("ClassCache"); +--local CC = E:GetModule("ClassCache"); --Cache global variables --Lua functions @@ -13,10 +13,9 @@ local twipe = table.wipe local CreateFrame = CreateFrame local GetBattlefieldScore = GetBattlefieldScore local GetNumBattlefieldScores = GetNumBattlefieldScores -local UnitClass = UnitClass +--local UnitClass = UnitClass local UnitExists = UnitExists -local UnitGUID = UnitGUID -local SetCVar = SetCVar +--local SetCVar = SetCVar local WorldFrame = WorldFrame local WorldGetNumChildren, WorldGetChildren = WorldFrame.GetNumChildren, WorldFrame.GetChildren @@ -116,7 +115,6 @@ function mod:SetTargetFrame(frame) end frame.isTarget = true frame.unit = "target" - -- frame.guid = UnitGUID("target") if self.db.units[frame.UnitType].healthbar.enable ~= true then frame.Name:ClearAllPoints() @@ -598,7 +596,7 @@ end function mod:SearchNameplateByName(sourceName) if not sourceName then return end - local SearchFor = strsplit("-", sourceName) + local SearchFor = split("-", sourceName) for frame in pairs(self.VisiblePlates) do if frame and frame:IsShown() and frame.UnitName == SearchFor and RAID_CLASS_COLORS[frame.UnitClass] then return frame diff --git a/ElvUI/Modules/Skins/Blizzard/Craft.lua b/ElvUI/Modules/Skins/Blizzard/Craft.lua index a554cb7..68133bd 100644 --- a/ElvUI/Modules/Skins/Blizzard/Craft.lua +++ b/ElvUI/Modules/Skins/Blizzard/Craft.lua @@ -5,7 +5,7 @@ local S = E:GetModule("Skins"); --Lua functions local _G = _G local unpack = unpack -local find, match, split = string.find, string.match, string.split +local find, match = string.find, string.match --WoW API / Variables local CreateFrame = CreateFrame local GetItemInfo = GetItemInfo diff --git a/ElvUI/Modules/Skins/Blizzard/Debug.lua b/ElvUI/Modules/Skins/Blizzard/Debug.lua index b393ba0..73ab5ce 100644 --- a/ElvUI/Modules/Skins/Blizzard/Debug.lua +++ b/ElvUI/Modules/Skins/Blizzard/Debug.lua @@ -6,8 +6,6 @@ local S = E:GetModule("Skins"); local _G = _G local unpack = unpack local getn = table.getn ---WoW API / Variables -local hooksecurefunc = hooksecurefunc local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.debug ~= true then return end @@ -54,7 +52,6 @@ local function LoadSkin() E:Point(ScriptErrorsFrame.next, "BOTTOM", ScriptErrorsFrame, "BOTTOM", 50, 7) E:Point(ScriptErrorsFrame.close, "BOTTOMRIGHT", -12, 8) - local noscalemult = E.mult * GetCVar("uiScale") HookScript(FrameStackTooltip, "OnShow", function() E:SetTemplate(this, "Transparent") this:SetBackdropColor(unpack(E["media"].backdropfadecolor)) diff --git a/ElvUI/Modules/Skins/Blizzard/Friends.lua b/ElvUI/Modules/Skins/Blizzard/Friends.lua index cd395b9..c1990d7 100644 --- a/ElvUI/Modules/Skins/Blizzard/Friends.lua +++ b/ElvUI/Modules/Skins/Blizzard/Friends.lua @@ -5,7 +5,6 @@ local S = E:GetModule("Skins"); --Lua functions local _G = _G local unpack = unpack -local upper = string.upper --WoW API / Variables local GetWhoInfo = GetWhoInfo local GetGuildRosterInfo = GetGuildRosterInfo diff --git a/ElvUI/Modules/Skins/Blizzard/Inspect.lua b/ElvUI/Modules/Skins/Blizzard/Inspect.lua index 0d38889..b5bfae1 100644 --- a/ElvUI/Modules/Skins/Blizzard/Inspect.lua +++ b/ElvUI/Modules/Skins/Blizzard/Inspect.lua @@ -6,7 +6,7 @@ local S = E:GetModule("Skins"); local _G = _G local unpack = unpack local pairs = pairs -local find, match, split = string.find, string.match, string.split +local match = string.match --WoW API / Variables local GetInventoryItemLink = GetInventoryItemLink local GetItemInfo = GetItemInfo diff --git a/ElvUI/Modules/Skins/Blizzard/Loot.lua b/ElvUI/Modules/Skins/Blizzard/Loot.lua index 838d903..343a1fb 100644 --- a/ElvUI/Modules/Skins/Blizzard/Loot.lua +++ b/ElvUI/Modules/Skins/Blizzard/Loot.lua @@ -60,7 +60,6 @@ local function LoadSkin() for i = 1, LOOTFRAME_NUMBUTTONS do local slot = (((LootFrame.page - 1) * numLootToShow) + i) local lootButton = _G["LootButton"..i] - local lootButtonIcon = _G["LootButton"..i.."IconTexture"] S:HandleItemButton(lootButton, true) diff --git a/ElvUI/Modules/Skins/Blizzard/Mail.lua b/ElvUI/Modules/Skins/Blizzard/Mail.lua index 15d2107..40e7701 100644 --- a/ElvUI/Modules/Skins/Blizzard/Mail.lua +++ b/ElvUI/Modules/Skins/Blizzard/Mail.lua @@ -9,7 +9,6 @@ local ipairs, unpack = ipairs, unpack local GetInboxHeaderInfo = GetInboxHeaderInfo local GetInboxItem = GetInboxItem local GetInboxNumItems = GetInboxNumItems -local GetItemInfo = GetItemInfo local GetItemInfoByName = GetItemInfoByName local GetItemQualityColor = GetItemQualityColor local GetSendMailItem = GetSendMailItem diff --git a/ElvUI/Modules/Skins/Blizzard/Merchant.lua b/ElvUI/Modules/Skins/Blizzard/Merchant.lua index 7db2844..06932b8 100644 --- a/ElvUI/Modules/Skins/Blizzard/Merchant.lua +++ b/ElvUI/Modules/Skins/Blizzard/Merchant.lua @@ -5,13 +5,12 @@ local S = E:GetModule("Skins"); --Lua functions local _G = _G local unpack = unpack -local match, split = string.match, string.split +local match = string.match --WoW API / Variables local GetBuybackItemInfo = GetBuybackItemInfo local GetItemInfo = GetItemInfo local GetItemQualityColor = GetItemQualityColor local GetMerchantItemLink = GetMerchantItemLink -local GetItemLinkByName = GetItemLinkByName local hooksecurefunc = hooksecurefunc local function LoadSkin() @@ -41,8 +40,6 @@ local function LoadSkin() local item = _G["MerchantItem"..i] local itemButton = _G["MerchantItem"..i.."ItemButton"] local iconTexture = _G["MerchantItem"..i.."ItemButtonIconTexture"] - local altCurrencyTex1 = _G["MerchantItem"..i.."AltCurrencyFrameItem1Texture"] - local altCurrencyTex2 = _G["MerchantItem"..i.."AltCurrencyFrameItem2Texture"] E:StripTextures(item, true) E:CreateBackdrop(item, "Default") diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua index e103ca4..e35a01a 100644 --- a/ElvUI/Modules/Skins/Blizzard/Misc.lua +++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua @@ -5,10 +5,7 @@ local S = E:GetModule("Skins"); --Lua functions local _G = _G local unpack = unpack -local find = string.find --WoW API / Variables -local IsAddOnLoaded = IsAddOnLoaded -local UnitIsUnit = UnitIsUnit local hooksecurefunc = hooksecurefunc local function LoadSkin() @@ -370,7 +367,7 @@ local function LoadSkin() end -- Interface Options Checkboxes - for index, value in UIOptionsFrameCheckButtons do + for _, value in UIOptionsFrameCheckButtons do local UIOptionsFrameCheckBox = _G["UIOptionsFrameCheckButton"..value.index] if UIOptionsFrameCheckBox then S:HandleCheckBox(UIOptionsFrameCheckBox) @@ -378,7 +375,7 @@ local function LoadSkin() end -- Video Options Checkboxes - for index, value in OptionsFrameCheckButtons do + for _, value in OptionsFrameCheckButtons do local OptionsFrameCheckButton = _G["OptionsFrameCheckButton"..value.index] if OptionsFrameCheckButton then S:HandleCheckBox(OptionsFrameCheckButton) @@ -386,7 +383,7 @@ local function LoadSkin() end -- Sound Options Checkboxes - for index, value in SoundOptionsFrameCheckButtons do + for _, value in SoundOptionsFrameCheckButtons do local SoundOptionsFrameCheckButton = _G["SoundOptionsFrameCheckButton"..value.index] if SoundOptionsFrameCheckButton then S:HandleCheckBox(SoundOptionsFrameCheckButton) @@ -394,17 +391,17 @@ local function LoadSkin() end -- Interface Options Sliders - for i, v in UIOptionsFrameSliders do + for i in UIOptionsFrameSliders do S:HandleSliderFrame(_G["UIOptionsFrameSlider"..i]) end -- Video Options Sliders - for i, v in OptionsFrameSliders do + for i in OptionsFrameSliders do S:HandleSliderFrame(_G["OptionsFrameSlider"..i]) end -- Sound Options Sliders - for i, v in SoundOptionsFrameSliders do + for i in SoundOptionsFrameSliders do S:HandleSliderFrame(_G["SoundOptionsFrameSlider"..i]) end end diff --git a/ElvUI/Modules/Skins/Blizzard/Quest.lua b/ElvUI/Modules/Skins/Blizzard/Quest.lua index 9350698..6f10bdd 100644 --- a/ElvUI/Modules/Skins/Blizzard/Quest.lua +++ b/ElvUI/Modules/Skins/Blizzard/Quest.lua @@ -6,7 +6,7 @@ local S = E:GetModule("Skins"); local _G = _G local pairs = pairs local unpack = unpack -local find, format, match, split = string.find, string.format, string.match, string.split +local find, format, match = string.find, string.format, string.match --WoW API / Variables local GetItemInfo = GetItemInfo local GetItemQualityColor = GetItemQualityColor diff --git a/ElvUI/Modules/Skins/Blizzard/Raid.lua b/ElvUI/Modules/Skins/Blizzard/Raid.lua index 10d3085..a838ac1 100644 --- a/ElvUI/Modules/Skins/Blizzard/Raid.lua +++ b/ElvUI/Modules/Skins/Blizzard/Raid.lua @@ -4,7 +4,6 @@ local S = E:GetModule("Skins"); --Cache global variables --Lua functions local _G = _G -local unpack = unpack local pairs = pairs --WoW API / Variables local hooksecurefunc = hooksecurefunc diff --git a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua index 1da9e77..9c0109b 100644 --- a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua +++ b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua @@ -5,7 +5,7 @@ local S = E:GetModule("Skins"); --Lua functions local _G = _G local unpack = unpack -local find, match, split = string.find, string.match, string.split +local find, match = string.find, string.match --WoW API / Variables local CreateFrame = CreateFrame local GetItemInfo = GetItemInfo diff --git a/ElvUI/Modules/Tooltip/Tooltip.lua b/ElvUI/Modules/Tooltip/Tooltip.lua index 666ba56..3788f95 100644 --- a/ElvUI/Modules/Tooltip/Tooltip.lua +++ b/ElvUI/Modules/Tooltip/Tooltip.lua @@ -158,14 +158,12 @@ function TT:UPDATE_MOUSEOVER_UNIT(_, unit) TT:RemoveTrashLines(GameTooltip) local level = UnitLevel(unit) - local isShiftKeyDown = IsShiftKeyDown() local color if UnitIsPlayer(unit) then local localeClass, class = UnitClass(unit) local name = UnitName(unit) local guildName, guildRankName = GetGuildInfo(unit) - local pvpName = UnitPVPName(unit) if not localeClass or not class then return end color = CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[class] or RAID_CLASS_COLORS[class] diff --git a/ElvUI/Modules/UnitFrames/Config_Enviroment.lua b/ElvUI/Modules/UnitFrames/Config_Enviroment.lua index f667b46..e77913e 100644 --- a/ElvUI/Modules/UnitFrames/Config_Enviroment.lua +++ b/ElvUI/Modules/UnitFrames/Config_Enviroment.lua @@ -7,7 +7,7 @@ local ElvUF = ns.oUF; --Lua functions local _G = _G local setmetatable, getfenv, setfenv = setmetatable, getfenv, setfenv -local type, unpack, select, pairs = type, unpack, select, pairs +local type, unpack, pairs = type, unpack, pairs local min, random = math.min, math.random local format = string.format local find = string.find diff --git a/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua b/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua index ecd1d26..d339f4e 100644 --- a/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua +++ b/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua @@ -7,7 +7,6 @@ local match = string.match local strsplit = strsplit local tostring = tostring local format = format -local select = select local getn = table.getn --WoW API / Variables local CreateFrame = CreateFrame diff --git a/ElvUI/Modules/UnitFrames/Elements/Castbar.lua b/ElvUI/Modules/UnitFrames/Elements/Castbar.lua index 104147e..3d961b1 100644 --- a/ElvUI/Modules/UnitFrames/Elements/Castbar.lua +++ b/ElvUI/Modules/UnitFrames/Elements/Castbar.lua @@ -3,7 +3,7 @@ local UF = E:GetModule("UnitFrames"); --Cache global variables --Lua functions -local unpack, tonumber = unpack, tonumber +local unpack = unpack local abs, min = abs, math.min --WoW API / Variables local CreateFrame = CreateFrame diff --git a/ElvUI/Modules/UnitFrames/Elements/FrameGlow.lua b/ElvUI/Modules/UnitFrames/Elements/FrameGlow.lua index a8bfbb5..e531585 100644 --- a/ElvUI/Modules/UnitFrames/Elements/FrameGlow.lua +++ b/ElvUI/Modules/UnitFrames/Elements/FrameGlow.lua @@ -101,7 +101,6 @@ end function UF:FrameGlow_PositionGlow(frame, mainGlow, powerGlow) if not (frame and frame.VARIABLES_SET) then return end - local infoPanel = frame.InfoPanel local additionalPower = frame.AdditionalPower local runes = frame.Runes local comboPoints = frame.ComboPoints diff --git a/ElvUI/Modules/UnitFrames/Groups/Party.lua b/ElvUI/Modules/UnitFrames/Groups/Party.lua index a03166b..8376da5 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Party.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Party.lua @@ -2,10 +2,8 @@ local E, L, V, P, G = unpack(ElvUI) local UF = E:GetModule("UnitFrames") local _G = _G -local tinsert = table.insert local CreateFrame = CreateFrame -local IsInInstance = IsInInstance local ns = oUF local ElvUF = ns.oUF diff --git a/ElvUI/Modules/UnitFrames/Tags.lua b/ElvUI/Modules/UnitFrames/Tags.lua index 1935e9b..7116869 100644 --- a/ElvUI/Modules/UnitFrames/Tags.lua +++ b/ElvUI/Modules/UnitFrames/Tags.lua @@ -6,7 +6,6 @@ local _G = _G local floor = math.floor local format = string.format --WoW API / Variables -local GetPVPTimer = GetPVPTimer local GetTime = GetTime local UnitClass = UnitClass local UnitClassification = UnitClassification diff --git a/ElvUI/Modules/UnitFrames/UnitFrames.lua b/ElvUI/Modules/UnitFrames/UnitFrames.lua index e8273ac..73ed7de 100644 --- a/ElvUI/Modules/UnitFrames/UnitFrames.lua +++ b/ElvUI/Modules/UnitFrames/UnitFrames.lua @@ -16,8 +16,6 @@ local CreateFrame = CreateFrame local UnitFrame_OnEnter = UnitFrame_OnEnter local UnitFrame_OnLeave = UnitFrame_OnLeave local IsInInstance = IsInInstance -local InCombatLockdown = InCombatLockdown -local GetInstanceInfo = GetInstanceInfo local UnregisterStateDriver = UnregisterStateDriver local RegisterStateDriver = RegisterStateDriver local MAX_RAID_MEMBERS = MAX_RAID_MEMBERS diff --git a/ElvUI_Config/ActionBars.lua b/ElvUI_Config/ActionBars.lua index 90366c0..2b0f429 100644 --- a/ElvUI_Config/ActionBars.lua +++ b/ElvUI_Config/ActionBars.lua @@ -7,7 +7,6 @@ local ACD = LibStub("AceConfigDialog-3.0"); local _G = _G local getn = table.getn --WoW API / Variables -local SetCVar = SetCVar local GameTooltip = _G["GameTooltip"] local ACTIONBAR_LABEL, COLOR, GENERAL, LOCK_ACTIONBAR_TEXT, NONE = ACTIONBAR_LABEL, COLOR, GENERAL, LOCK_ACTIONBAR_TEXT, NONE diff --git a/ElvUI_Config/Nameplates.lua b/ElvUI_Config/Nameplates.lua index 16c2723..9e27997 100644 --- a/ElvUI_Config/Nameplates.lua +++ b/ElvUI_Config/Nameplates.lua @@ -1,6 +1,5 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local NP = E:GetModule("NamePlates"); -local ACD = LibStub("AceConfigDialog-3.0") --Cache global variables --Lua functions diff --git a/ElvUI_Config/Tooltip.lua b/ElvUI_Config/Tooltip.lua index 0337bb0..ea7f8d9 100644 --- a/ElvUI_Config/Tooltip.lua +++ b/ElvUI_Config/Tooltip.lua @@ -6,7 +6,7 @@ local TT = E:GetModule("Tooltip"); local tonumber, tostring = tonumber, tostring local getn = table.getn --WoW API / Variables -local ACTIONBAR_LABEL, FONT_SIZE, GENERAL, HIDE, NONE, OPACITY = ACTIONBAR_LABEL, FONT_SIZE, GENERAL, HIDE, NONE, OPACITY +local ACTIONBAR_LABEL, FONT_SIZE, GENERAL, NONE, OPACITY = ACTIONBAR_LABEL, FONT_SIZE, GENERAL, NONE, OPACITY E.Options.args.tooltip = { type = "group", diff --git a/ElvUI_Config/UnitFrames.lua b/ElvUI_Config/UnitFrames.lua index d269470..3dae7d0 100644 --- a/ElvUI_Config/UnitFrames.lua +++ b/ElvUI_Config/UnitFrames.lua @@ -9,8 +9,8 @@ local ElvUF = ns.oUF local _G = _G local find, format = string.find, string.format local gsub, match, split = string.gsub, string.match, string.split -local ipairs, next, pairs, select = ipairs, next, pairs, select local concat, getn, insert, remove, wipe = table.concat, table.getn, table.insert, table.remove, table.wipe +local ipairs, pairs, select = ipairs, pairs, select --WoW API / Variables local GetScreenWidth = GetScreenWidth local IsAddOnLoaded = IsAddOnLoaded @@ -84,9 +84,9 @@ local auraBarsSortValues = { local auraSortValues = { ["TIME_REMAINING"] = L["Time Remaining"], ["DURATION"] = L["Duration"], - ["NAME"] = "NAME", + ["NAME"] = NAME, ["INDEX"] = L["Index"], - ["PLAYER"] = "PLAYER", + ["PLAYER"] = PLAYER, } local auraSortMethodValues = { @@ -1259,7 +1259,6 @@ local function GetOptionsTable_Power(hasDetatchOption, updateFunc, groupName, nu if numUnits then for i=1, numUnits do if _G[frameName..i] then - local v = _G[frameName..i].Power:GetValue() local min, max = _G[frameName..i].Power:GetMinMaxValues() _G[frameName..i].Power:SetMinMaxValues(min, max + 500) _G[frameName..i].Power:SetValue(1) @@ -1268,7 +1267,6 @@ local function GetOptionsTable_Power(hasDetatchOption, updateFunc, groupName, nu end else if _G[frameName] and _G[frameName].Power then - local v = _G[frameName].Power:GetValue() local min, max = _G[frameName].Power:GetMinMaxValues() _G[frameName].Power:SetMinMaxValues(min, max + 500) _G[frameName].Power:SetValue(1) @@ -1277,7 +1275,6 @@ local function GetOptionsTable_Power(hasDetatchOption, updateFunc, groupName, nu for i=1, _G[frameName]:GetNumChildren() do local child = select(i, _G[frameName]:GetChildren()) if child and child.Power then - local v = child.Power:GetValue() local min, max = child.Power:GetMinMaxValues() child.Power:SetMinMaxValues(min, max + 500) child.Power:SetValue(1) @@ -3712,13 +3709,6 @@ E.Options.args.unitframe.args.pettarget = { }, } -local groupPoints = { - ["TOP"] = "TOP", - ["BOTTOM"] = "BOTTOM", - ["LEFT"] = "LEFT", - ["RIGHT"] = "RIGHT", -} - --Party Frames E.Options.args.unitframe.args.party = { name = L["Party Frames"],