Skip to content

Commit 0d91615

Browse files
MerathilisMerathilis
committed
More Fixes and comment out stuff for now. Note: Skins are disabled for now
1 parent e92b887 commit 0d91615

File tree

14 files changed

+41
-19
lines changed

14 files changed

+41
-19
lines changed

‎ElvUI/Core/Developer/Frame.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local print, strmatch, strlower = print, strmatch, strlower
22
local _G, UNKNOWN, format, type, next = _G, UNKNOWN, format, type, next
33

44
local SlashCmdList = SlashCmdList
5-
local GetMouseFocus = GetMouseFocus
5+
local GetMouseFocus = GetMouseFoci or GetMouseFocus
66
local UIParentLoadAddOn = UIParentLoadAddOn
77

88
local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo

‎ElvUI/Core/General/API.lua‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -775,9 +775,10 @@ function E:SetupGameMenu()
775775
GameMenuFrame.ElvUI = button
776776

777777
if not E:IsAddOnEnabled('ConsolePortUI_Menu') then
778-
button:Size(GameMenuButtonLogout:GetWidth(), GameMenuButtonLogout:GetHeight())
779-
button:Point('TOPLEFT', GameMenuButtonAddons, 'BOTTOMLEFT', 0, -1)
780-
hooksecurefunc('GameMenuFrame_UpdateVisibleButtons', E.PositionGameMenuButton)
778+
button:Size(100, 30)
779+
button:Point('TOPLEFT', GameMenuFrame, 'BOTTOMLEFT', 0, -1)
780+
-- FIX ME 11.0
781+
--hooksecurefunc('GameMenuFrame_UpdateVisibleButtons', E.PositionGameMenuButton)
781782
end
782783
end
783784

‎ElvUI/Core/General/Config.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ local CreateFrame = CreateFrame
1515
local InCombatLockdown = InCombatLockdown
1616
local IsAltKeyDown = IsAltKeyDown
1717
local IsControlKeyDown = IsControlKeyDown
18-
local GetMouseFocus = GetMouseFocus
18+
local GetMouseFocus = GetMouseFoci or GetMouseFocus
1919
local UIParent = UIParent
2020

2121
local EditBox_HighlightText = EditBox_HighlightText

‎ElvUI/Core/Modules/ActionBars/ActionBars.lua‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ local ClearOverrideBindings = ClearOverrideBindings
1010
local CreateFrame = CreateFrame
1111
local GetBindingKey = GetBindingKey
1212
local GetOverrideBarIndex = GetOverrideBarIndex
13-
local GetSpellBookItemInfo = GetSpellBookItemInfo
13+
local GetSpellBookItemInfo = C_SpellBook and C_SpellBook.GetSpellBookItemInfo or GetSpellBookItemInfo
1414
local GetTempShapeshiftBarIndex = GetTempShapeshiftBarIndex
1515
local GetVehicleBarIndex = GetVehicleBarIndex
1616
local HasOverrideActionBar = HasOverrideActionBar
@@ -1120,7 +1120,9 @@ do
11201120
end
11211121
end
11221122

1123-
AB:FixSpellBookTaint()
1123+
if not E.Retail then
1124+
AB:FixSpellBookTaint()
1125+
end
11241126

11251127
-- shut down some events for things we dont use
11261128
_G.ActionBarController:UnregisterAllEvents()

‎ElvUI/Core/Modules/ActionBars/Bind.lua‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,11 @@ function AB:LoadKeyBinder()
329329
bind:SetScript('OnMouseUp', function(_, key) self:BindListener(key) end)
330330
bind:SetScript('OnMouseWheel', function(_, delta) if delta>0 then self:BindListener('MOUSEWHEELUP') else self:BindListener('MOUSEWHEELDOWN') end end)
331331

332-
for i = 1, 12 do
333-
local b = _G['SpellButton'..i]
334-
b:HookScript('OnEnter', function(s) AB:BindUpdate(s, 'SPELL') end)
332+
if not E.Retail then
333+
for i = 1, 12 do
334+
local b = _G['SpellButton'..i]
335+
b:HookScript('OnEnter', function(s) AB:BindUpdate(s, 'SPELL') end)
336+
end
335337
end
336338

337339
local function buttonOnEnter(b) AB:BindUpdate(b) end

‎ElvUI/Core/Modules/Bags/Bags.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2922,7 +2922,8 @@ function B:Initialize()
29222922
if E.Wrath then
29232923
B:SecureHook('BackpackTokenFrame_Update', 'UpdateTokens')
29242924
elseif E.Retail then
2925-
B:RawHook('TokenFrame_SetTokenWatched', 'TokenFrame_SetTokenWatched', true)
2925+
-- Fix ME 11.0
2926+
--B:RawHook('TokenFrame_SetTokenWatched', 'TokenFrame_SetTokenWatched', true)
29262927
end
29272928

29282929
if E.Retail then

‎ElvUI/Core/Modules/Chat/Chat.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ local GetChatWindowInfo = GetChatWindowInfo
2525
local GetCursorPosition = GetCursorPosition
2626
local GetGuildRosterMOTD = GetGuildRosterMOTD
2727
local GetInstanceInfo = GetInstanceInfo
28-
local GetMouseFocus = GetMouseFocus
28+
local GetMouseFocus = GetMouseFoci or GetMouseFocus
2929
local GetNumGroupMembers = GetNumGroupMembers
3030
local GetPlayerCommunityLink = GetPlayerCommunityLink
3131
local GetPlayerInfoByGUID = GetPlayerInfoByGUID

‎ElvUI/Core/Modules/Misc/EditorMode.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ function EM:Initialize()
122122
_G.EditModeManagerFrame.onCloseCallback = EM.OnClose
123123

124124
-- keep the button off during combat
125-
hooksecurefunc(_G.GameMenuButtonEditMode, 'SetEnabled', EM.SetEnabled)
125+
-- Fix ME 11.0
126+
--hooksecurefunc(_G.GameMenuButtonEditMode, 'SetEnabled', EM.SetEnabled)
126127

127128
-- wait for combat leave to do stuff
128129
EM:RegisterEvent('EDIT_MODE_LAYOUTS_UPDATED', 'LAYOUTS_UPDATED')

‎ElvUI/Core/Modules/Tooltip/Tooltip.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ local GetCraftSelectionIndex = GetCraftSelectionIndex
2222
local GetCreatureDifficultyColor = GetCreatureDifficultyColor
2323
local GetGuildInfo = GetGuildInfo
2424
local GetItemCount = C_Item and C_Item.GetItemCount or GetItemCount
25-
local GetMouseFocus = GetMouseFocus
25+
local GetMouseFocus = GetMouseFoci or GetMouseFocus
2626
local GetNumGroupMembers = GetNumGroupMembers
2727
local GetRelativeDifficultyColor = GetRelativeDifficultyColor
2828
local GetTime = GetTime

‎ElvUI/Mainline/Modules/Blizzard/ObjectiveFrame.lua‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,21 @@ local function ObjectiveTracker_UpdateBackground()
4646
end
4747
end
4848

49+
-- Fix me for 11.0
4950
local function ObjectiveTracker_Collapse()
51+
if E.Retail then return end
52+
5053
Tracker.collapsed = true
5154
Tracker.BlocksFrame:Hide()
5255
Tracker.HeaderMenu.MinimizeButton:SetCollapsed(true)
5356
Tracker.HeaderMenu.Title:Show()
5457
ObjectiveTracker_UpdateBackground()
5558
end
5659

60+
-- Fix me for 11.0
5761
local function ObjectiveTracker_Expand()
62+
if E.Retail then return end
63+
5864
Tracker.collapsed = nil
5965
Tracker.BlocksFrame:Show()
6066
Tracker.HeaderMenu.MinimizeButton:SetCollapsed(false)
@@ -63,7 +69,9 @@ local function ObjectiveTracker_Expand()
6369
end
6470
-- end clone
6571

72+
-- Fix me for 11.0
6673
function BL:ObjectiveTracker_AutoHideOnHide()
74+
if E.Retail then return end
6775
if Tracker.collapsed then return end
6876

6977
if E.db.general.objectiveFrameAutoHideInKeystone then
@@ -76,14 +84,18 @@ function BL:ObjectiveTracker_AutoHideOnHide()
7684
end
7785
end
7886

87+
-- Fix me for 11.0
7988
function BL:ObjectiveTracker_AutoHideOnShow()
89+
if E.Retail then return end
90+
8091
if Tracker.collapsed then
8192
ObjectiveTracker_Expand()
8293
end
8394
end
8495

8596
function BL:ObjectiveTracker_Setup()
86-
hooksecurefunc(_G.BonusObjectiveRewardsFrameMixin, 'AnimateReward', BonusRewards_SetPosition)
97+
-- FIX ME 11.0 mostly not there anymore
98+
--hooksecurefunc(_G.ObjectiveTrackerRewardsToastMixin, 'AnimateReward', BonusRewards_SetPosition)
8799

88100
BL:ObjectiveTracker_AutoHide()
89101
end

0 commit comments

Comments
 (0)