Skip to content

Commit 3315ff6

Browse files
committed
clean up
1 parent a606abd commit 3315ff6

File tree

6 files changed

+6
-26
lines changed

6 files changed

+6
-26
lines changed

Diff for: ElvUI/Cata/Modules/Skins/Bags.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ function S:ContainerFrame()
140140
end
141141
end)
142142

143-
if BackpackTokenFrame then
144-
BackpackTokenFrame:StripTextures()
143+
if _G.BackpackTokenFrame then
144+
_G.BackpackTokenFrame:StripTextures()
145145
end
146146

147147
-- BankFrame

Diff for: ElvUI/Core/Developer/Frame.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local IsAddOnLoaded = C_AddOns.IsAddOnLoaded
99
local LoadAddOn = C_AddOns.LoadAddOn
1010

1111
local GetMouseFocus = GetMouseFocus or function()
12-
local frames = GetMouseFoci()
12+
local frames = _G.GetMouseFoci()
1313
return frames and frames[1]
1414
end
1515

Diff for: ElvUI/Mainline/Modules/Blizzard/ObjectiveFrame.lua

-21
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,6 @@ local BL = E:GetModule('Blizzard')
44
local _G = _G
55
local GetInstanceInfo = GetInstanceInfo
66

7-
local function ObjectiveTracker_IsLeft()
8-
local x = _G.ObjectiveTrackerFrame:GetCenter()
9-
return x and x < (E.screenWidth * 0.5) -- positioned on left side
10-
end
11-
12-
local function BonusRewards_SetPosition(block)
13-
local rewards = _G.ObjectiveTrackerBonusRewardsFrame
14-
if not rewards then return end
15-
16-
rewards:ClearAllPoints()
17-
18-
if E.db.general.bonusObjectivePosition == 'RIGHT' or (E.db.general.bonusObjectivePosition == 'AUTO' and ObjectiveTracker_IsLeft()) then
19-
rewards:Point('TOPLEFT', block, 'TOPRIGHT', -10, -4)
20-
else
21-
rewards:Point('TOPRIGHT', block, 'TOPLEFT', 10, -4)
22-
end
23-
end
24-
257
function BL:ObjectiveTracker_AutoHideOnHide()
268
local tracker = _G.ObjectiveTrackerFrame
279
if tracker and tracker.autoHidden then return end
@@ -37,8 +19,5 @@ function BL:ObjectiveTracker_AutoHideOnHide()
3719
end
3820

3921
function BL:ObjectiveTracker_Setup()
40-
-- FIX ME 11.0 mostly not there anymore
41-
--hooksecurefunc(_G.ObjectiveTrackerRewardsToastMixin, 'AnimateReward', BonusRewards_SetPosition)
42-
4322
BL:ObjectiveTracker_AutoHide()
4423
end

Diff for: ElvUI/Mainline/Modules/DataTexts/SpecSwitch.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ local IsControlKeyDown = IsControlKeyDown
1414
local IsShiftKeyDown = IsShiftKeyDown
1515
local SetLootSpecialization = SetLootSpecialization
1616
local SetSpecialization = SetSpecialization
17-
local ToggleTalentFrame = ToggleTalentFrame
17+
local TogglePlayerSpellsFrame = TogglePlayerSpellsFrame
1818

1919
local LoadAddOn = C_AddOns.LoadAddOn
2020
local C_SpecializationInfo_GetAllSelectedPvpTalentIDs = C_SpecializationInfo.GetAllSelectedPvpTalentIDs

Diff for: ElvUI/Mainline/Modules/Skins/ScrappingMachine.lua

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ local E, L, V, P, G = unpack(ElvUI)
22
local S = E:GetModule('Skins')
33

44
local _G = _G
5+
local next = next
56
local unpack = unpack
67

78
function S:Blizzard_ScrappingMachineUI()

Diff for: ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ local UnitPowerMax = UnitPowerMax
2424
local UnitPowerType = UnitPowerType
2525

2626
local GetMouseFocus = GetMouseFocus or function()
27-
local frames = GetMouseFoci()
27+
local frames = _G.GetMouseFoci()
2828
return frames and frames[1]
2929
end
3030

0 commit comments

Comments
 (0)