Skip to content

Commit 23b2d81

Browse files
committed
nothing
1 parent 0d91615 commit 23b2d81

File tree

10 files changed

+29
-26
lines changed

10 files changed

+29
-26
lines changed

ElvUI/Core/Modules/ActionBars/ActionBars.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ local ClearOverrideBindings = ClearOverrideBindings
1010
local CreateFrame = CreateFrame
1111
local GetBindingKey = GetBindingKey
1212
local GetOverrideBarIndex = GetOverrideBarIndex
13-
local GetSpellBookItemInfo = C_SpellBook and C_SpellBook.GetSpellBookItemInfo or GetSpellBookItemInfo
1413
local GetTempShapeshiftBarIndex = GetTempShapeshiftBarIndex
1514
local GetVehicleBarIndex = GetVehicleBarIndex
1615
local HasOverrideActionBar = HasOverrideActionBar
@@ -46,10 +45,12 @@ local NUM_ACTIONBAR_BUTTONS = NUM_ACTIONBAR_BUTTONS
4645
local COOLDOWN_TYPE_LOSS_OF_CONTROL = COOLDOWN_TYPE_LOSS_OF_CONTROL
4746
local CLICK_BINDING_NOT_AVAILABLE = CLICK_BINDING_NOT_AVAILABLE
4847

48+
local GetSpellBookItemInfo = (C_SpellBook and C_SpellBook.GetSpellBookItemInfo) or GetSpellBookItemInfo
49+
local ClearPetActionHighlightMarks = (PetActionBar and PetActionBar.ClearPetActionHighlightMarks) or ClearPetActionHighlightMarks
50+
4951
local C_ActionBar_GetProfessionQuality = C_ActionBar and C_ActionBar.GetProfessionQuality
5052
local C_PetBattles_IsInBattle = C_PetBattles and C_PetBattles.IsInBattle
5153
local C_PlayerInfo_GetGlidingInfo = C_PlayerInfo and C_PlayerInfo.GetGlidingInfo
52-
local ClearPetActionHighlightMarks = ClearPetActionHighlightMarks or PetActionBar.ClearPetActionHighlightMarks
5354
local ActionBarController_UpdateAllSpellHighlights = ActionBarController_UpdateAllSpellHighlights
5455

5556
local GetCVarBool = C_CVar.GetCVarBool

ElvUI/Core/Modules/DataBars/Reputation.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ local ipairs = ipairs
77
local huge = math.huge
88

99
local GameTooltip = GameTooltip
10-
local GetWatchedFactionInfo = C_Reputation and C_Reputation.GetWatchedFactionData or GetWatchedFactionInfo
1110
local ToggleCharacter = ToggleCharacter
1211

1312
local GetFriendshipReputation = GetFriendshipReputation or C_GossipInfo.GetFriendshipReputation
@@ -20,6 +19,7 @@ local C_MajorFactions_HasMaximumRenown = C_MajorFactions and C_MajorFactions.Has
2019
local C_QuestLog_GetInfo = C_QuestLog.GetInfo
2120
local C_QuestLog_GetNumQuestLogEntries = C_QuestLog.GetNumQuestLogEntries
2221
local C_QuestLog_GetQuestLogMajorFactionReputationRewards = C_QuestLog.GetQuestLogMajorFactionReputationRewards
22+
local GetWatchedFactionInfo = (C_Reputation and C_Reputation.GetWatchedFactionData) or GetWatchedFactionInfo
2323

2424
local BLUE_FONT_COLOR = BLUE_FONT_COLOR
2525
local RENOWN_LEVEL_LABEL = RENOWN_LEVEL_LABEL

ElvUI/Core/Modules/Tooltip/Tooltip.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ local GetCraftReagentItemLink = GetCraftReagentItemLink
2121
local GetCraftSelectionIndex = GetCraftSelectionIndex
2222
local GetCreatureDifficultyColor = GetCreatureDifficultyColor
2323
local GetGuildInfo = GetGuildInfo
24-
local GetItemCount = C_Item and C_Item.GetItemCount or GetItemCount
2524
local GetMouseFocus = GetMouseFoci or GetMouseFocus
2625
local GetNumGroupMembers = GetNumGroupMembers
2726
local GetRelativeDifficultyColor = GetRelativeDifficultyColor
@@ -71,6 +70,7 @@ local TooltipDataType = Enum.TooltipDataType
7170
local AddTooltipPostCall = TooltipDataProcessor and TooltipDataProcessor.AddTooltipPostCall
7271
local GetDisplayedItem = TooltipUtil and TooltipUtil.GetDisplayedItem
7372

73+
local GetItemCount = (C_Item and C_Item.GetItemCount) or GetItemCount
7474
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
7575
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
7676

ElvUI/Core/Modules/UnitFrames/Elements/AuraBars.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local unpack = unpack
88
local strfind = strfind
99

1010
local CreateFrame = CreateFrame
11-
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
11+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
1212

1313
local DebuffColors = E.Libs.Dispel:GetDebuffTypeColor()
1414

ElvUI/Mainline/Modules/Blizzard/ObjectiveFrame.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ local function ObjectiveTracker_UpdateBackground()
4646
end
4747
end
4848

49-
-- Fix me for 11.0
49+
-- Fix ME 11.0
5050
local function ObjectiveTracker_Collapse()
5151
if E.Retail then return end
5252

@@ -57,7 +57,7 @@ local function ObjectiveTracker_Collapse()
5757
ObjectiveTracker_UpdateBackground()
5858
end
5959

60-
-- Fix me for 11.0
60+
-- Fix ME 11.0
6161
local function ObjectiveTracker_Expand()
6262
if E.Retail then return end
6363

@@ -69,7 +69,7 @@ local function ObjectiveTracker_Expand()
6969
end
7070
-- end clone
7171

72-
-- Fix me for 11.0
72+
-- Fix ME 11.0
7373
function BL:ObjectiveTracker_AutoHideOnHide()
7474
if E.Retail then return end
7575
if Tracker.collapsed then return end
@@ -84,7 +84,7 @@ function BL:ObjectiveTracker_AutoHideOnHide()
8484
end
8585
end
8686

87-
-- Fix me for 11.0
87+
-- Fix ME 11.0
8888
function BL:ObjectiveTracker_AutoHideOnShow()
8989
if E.Retail then return end
9090

ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local pairs, unpack = pairs, unpack
66
local hooksecurefunc = hooksecurefunc
77
local InCombatLockdown = InCombatLockdown
88

9-
local headers = {
9+
local headers = { -- Fix ME 11.0
1010
--_G.ObjectiveTrackerBlocksFrame.QuestHeader,
1111
--_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
1212
--_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,

ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ local setmetatable = setmetatable
6565

6666
local CheckInteractDistance = CheckInteractDistance
6767
local GetInventoryItemLink = GetInventoryItemLink
68-
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
69-
local GetNumSpellTabs = (C_SpellBook and C_SpellBook.GetNumSpellBookSkillLines) or GetNumSpellTabs
70-
local GetSpellBookItemName = (C_SpellBook and C_SpellBook.GetSpellBookItemName) or GetSpellBookItemName
71-
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
72-
local GetSpellTabInfo = (C_SpellBook and C_SpellBook.GetSpellBookSkillLineInfo) or GetSpellTabInfo
7368
local GetTime = GetTime
7469
local InCombatLockdown = InCombatLockdown
7570
local IsItemInRange = IsItemInRange
@@ -84,6 +79,12 @@ local UnitIsUnit = UnitIsUnit
8479
local UnitIsVisible = UnitIsVisible
8580
local UnitRace = UnitRace
8681

82+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
83+
local GetNumSpellTabs = (C_SpellBook and C_SpellBook.GetNumSpellBookSkillLines) or GetNumSpellTabs
84+
local GetSpellBookItemName = (C_SpellBook and C_SpellBook.GetSpellBookItemName) or GetSpellBookItemName
85+
local GetSpellTabInfo = (C_SpellBook and C_SpellBook.GetSpellBookSkillLineInfo) or GetSpellTabInfo
86+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
87+
8788
local C_Timer = C_Timer
8889
local Item = Item
8990

@@ -661,13 +662,14 @@ local function findSpellIdx(spellName, sid)
661662
return nil
662663
end
663664

664-
-- FIX ME 11.0
665-
--for i = 1, getNumSpells() do
666-
--local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
667-
--if sid == id or (spellName == name and not MatchSpellByID[id]) then
668-
--return i
669-
--end
670-
--end
665+
--[[ FIX ME 11.0
666+
for i = 1, getNumSpells() do
667+
local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
668+
if sid == id or (spellName == name and not MatchSpellByID[id]) then
669+
return i
670+
end
671+
end
672+
]]
671673

672674
return nil
673675
end

ElvUI_Libraries/Core/oUF/elements/auras.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ local tinsert = tinsert
8484
local UnitIsUnit = UnitIsUnit
8585
local CreateFrame = CreateFrame
8686
local GameTooltip = GameTooltip
87-
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
87+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
8888
local floor, min = math.floor, math.min
8989
-- end block
9090

ElvUI_Options/Core/Filters.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ local strlower = strlower
1313
local strmatch = strmatch
1414
local tonumber = tonumber
1515
local tostring = tostring
16-
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
16+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
1717
local GetSpellSubtext = GetSpellSubtext
1818

1919
local quickSearchText, selectedSpell, selectedFilter, filterList, spellList = '', nil, nil, {}, {}

ElvUI_Options/Core/StyleFilters.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ local GetClassInfo = GetClassInfo
1414
local GetDifficultyInfo = GetDifficultyInfo
1515
local GetInstanceInfo = GetInstanceInfo
1616
local GetRealZoneText = GetRealZoneText
17-
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
18-
local GetSpellTexture = C_Spell and C_Spell.GetSpellTexture or GetSpellTexture
17+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
18+
local GetSpellTexture = (C_Spell and C_Spell.GetSpellTexture) or GetSpellTexture
1919
local tIndexOf = tIndexOf
2020

2121
local C_Map_GetMapInfo = C_Map.GetMapInfo

0 commit comments

Comments
 (0)