diff --git a/CHANGELOG.md b/CHANGELOG.md index e9a72ac5..5814bfdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v11.0.2 +* Fix spell dragging to icons (again) + ## v11.0.1 * Fix: #2174 - Autocast conditions not working * Fix: #2176, #2177, #2175, Many spells not tracking cooldowns properly diff --git a/Components/Core/IconType.lua b/Components/Core/IconType.lua index 8a1fa183..52021654 100644 --- a/Components/Core/IconType.lua +++ b/Components/Core/IconType.lua @@ -222,7 +222,7 @@ function IconType:DragReceived(icon, t, data, subType, param4) return end - local baseSpellName = GetSpellName(spellData.actionId) + local baseSpellName = GetSpellName(spellData.actionID) input = baseSpellName or spellData.name end diff --git a/Components/Core/Utils.lua b/Components/Core/Utils.lua index a8c74682..7460a01a 100644 --- a/Components/Core/Utils.lua +++ b/Components/Core/Utils.lua @@ -1409,7 +1409,7 @@ else -- itemType is for forward compat itemType = type == "SPELL" and 1 or -1, typeName = type, - actionId = baseSpellID, + actionID = baseSpellID, name = GetSpellBookItemName(index, book) } end diff --git a/Components/IconTypes/IconType_cooldown/cooldown.lua b/Components/IconTypes/IconType_cooldown/cooldown.lua index 9e1b4e2b..ab5857ae 100644 --- a/Components/IconTypes/IconType_cooldown/cooldown.lua +++ b/Components/IconTypes/IconType_cooldown/cooldown.lua @@ -33,6 +33,9 @@ local GetRuneCooldownDuration = TMW.GetRuneCooldownDuration local _, pclass = UnitClass("Player") +-- TODO: Preliminary testing has shown that C_Spell.IsSpellInRange behaves properly +-- with all inputs in wow 11.0+. Once it makes it to all game versions, +-- we can probably remove LibSpellRange. local IsSpellInRange = LibStub("SpellRange-1.0").IsSpellInRange diff --git a/Components/IconTypes/IconType_default/default.lua b/Components/IconTypes/IconType_default/default.lua index 553216a2..70c44458 100644 --- a/Components/IconTypes/IconType_default/default.lua +++ b/Components/IconTypes/IconType_default/default.lua @@ -72,7 +72,7 @@ function Type:DragReceived(icon, t, data, subType, param4) return end - local baseSpellName = GetSpellName(spellData.actionId) + local baseSpellName = GetSpellName(spellData.actionID) input = baseSpellName or spellData.name end diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua index e6ef3604..051441fa 100644 --- a/Options/CHANGELOG.lua +++ b/Options/CHANGELOG.lua @@ -3,6 +3,9 @@ if not TMW then return end TMW.CHANGELOG_LASTVER="7.4.0" TMW.CHANGELOG = [==[ +## v11.0.2 +* Fix spell dragging to icons (again) + ## v11.0.1 * Fix: #2174 - Autocast conditions not working * Fix: #2176, #2177, #2175, Many spells not tracking cooldowns properly diff --git a/TellMeWhen-Cata.toc b/TellMeWhen-Cata.toc index eaecfff4..63152cc8 100644 --- a/TellMeWhen-Cata.toc +++ b/TellMeWhen-Cata.toc @@ -18,7 +18,7 @@ ## X-WoWI-ID: 10855 ## X-Wago-ID: ZQ6aZqKW -## Version: 11.0.1 +## Version: 11.0.2 ## Author: Cybeloras of Aerie Peak ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick diff --git a/TellMeWhen-Classic.toc b/TellMeWhen-Classic.toc index 1d58fe34..7e7fd1ab 100644 --- a/TellMeWhen-Classic.toc +++ b/TellMeWhen-Classic.toc @@ -18,7 +18,7 @@ ## X-WoWI-ID: 10855 ## X-Wago-ID: ZQ6aZqKW -## Version: 11.0.1 +## Version: 11.0.2 ## Author: Cybeloras of Aerie Peak ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick diff --git a/TellMeWhen-Wrath.toc b/TellMeWhen-Wrath.toc index 633d84ab..a8467671 100644 --- a/TellMeWhen-Wrath.toc +++ b/TellMeWhen-Wrath.toc @@ -18,7 +18,7 @@ ## X-WoWI-ID: 10855 ## X-Wago-ID: ZQ6aZqKW -## Version: 11.0.1 +## Version: 11.0.2 ## Author: Cybeloras of Aerie Peak ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick diff --git a/TellMeWhen.toc b/TellMeWhen.toc index e26a2547..6f0debfb 100644 --- a/TellMeWhen.toc +++ b/TellMeWhen.toc @@ -18,7 +18,7 @@ ## X-WoWI-ID: 10855 ## X-Wago-ID: ZQ6aZqKW -## Version: 11.0.1 +## Version: 11.0.2 ## Author: Cybeloras of Aerie Peak ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick