Simplify cancelling travel form, since the wiki lied to me :)

Author: Numynum

TalentLoadoutBroker.lua

@@ -6,7 +6,6 @@ local TLB = ns.TLB;
 
 local starterConfigID = Constants.TraitConsts.STARTER_BUILD_TRAIT_CONFIG_ID;
 local isDruid = select(2, UnitClass('player')) == 'DRUID';
-local cancelFormButton = CreateFrame('Button', nil, UIParent, 'InsecureActionButtonTemplate');
 
 function TLB:Init()
     EventUtil.ContinueOnAddOnLoaded(addonName, function()
@@ -30,19 +29,6 @@ function TLB:Init()
         SlashCmdList['TALENT_LOADOUT_BROKER'] = function() ns.Config:OpenConfig(); end
     end);
 
-    cancelFormButton:SetAttribute('type', 'macro');
-    cancelFormButton:SetAttribute('macrotext', '/cancelform [form:3]');
-    cancelFormButton:SetAttribute('useOnKeyDown', true);
-    cancelFormButton:RegisterForClicks('AnyDown')
-    cancelFormButton:SetFrameStrata('FULLSCREEN_DIALOG');
-    cancelFormButton:SetFrameLevel(9999);
-    cancelFormButton:SetPropagateMouseMotion(true);
-    cancelFormButton:HookScript('OnClick', function(self)
-        self.elementDescription:Pick(MenuInputContext.MouseButton, 'LeftButton');
-        self:ClearAllPoints();
-        self:Hide();
-    end);
-
     self.configIDs, self.configIDToName, self.currentConfigID = nil, nil, nil;
     self.updatePending, self.pendingDisableStarterBuild, self.pendingConfigID = false, false, nil;
     self.currentConfigID = nil;
@@ -405,7 +391,12 @@ function TLB:GenerateSpecDropdown(rootDescription)
     do
         rootDescription:CreateTitle(SPECIALIZATION);
         local function isSelected(data) return activeSpecIndex == data; end
-        local function selectSpec(data) self:SelectSpec(data); end
+        local function selectSpec(data)
+            if isDruid and GetShapeshiftForm() == 3 then
+                CancelShapeshiftForm();
+            end
+            self:SelectSpec(data);
+        end
 
         for specIndex = 1, numSpecs do
             local _, name, _, icon = GetSpecializationInfoForClassID(PlayerUtil.GetClassID(), specIndex);
@@ -416,20 +407,14 @@ function TLB:GenerateSpecDropdown(rootDescription)
                 specIndex
             );
             if isDruid then
-                button:HookOnEnter(function(frame, elementDescription)
-                    cancelFormButton:ClearAllPoints();
-                    cancelFormButton:SetAllPoints(frame);
-                    cancelFormButton:Show();
-                    cancelFormButton.elementDescription = elementDescription;
+                button:HookOnEnter(function(frame)
                     if GetShapeshiftForm() == 3 then
                         GameTooltip:SetOwner(frame, 'ANCHOR_TOP');
                         GameTooltip:SetText('This will cancel your travel form!');
                         GameTooltip:Show();
                     end
                 end);
                 button:HookOnLeave(function()
-                    cancelFormButton:ClearAllPoints();
-                    cancelFormButton:Hide();
                     GameTooltip:Hide();
                 end);
             end