Merge pull request #9 from johnson-christopher/override-show-method

Refactor to prevent zoning from toggling it back on

Author: johnson-christopher

HideExpansionButton.lua

@@ -1,21 +1,17 @@
+-- Used to store a backup of the original "Show" method to restore it later if needed.
+local originalShowFunction = nil
+
 local frame = CreateFrame("FRAME", "HideExpansionButtonFrame")
 frame:RegisterEvent("ADDON_LOADED")
-frame:RegisterEvent("COVENANT_CALLINGS_UPDATED")
-frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+frame:RegisterEvent("PLAYER_LOGIN")
 
 frame:SetScript("OnEvent", function(self, event, ...)
     if event == "ADDON_LOADED" then
         local addonName = ...
         if addonName == "HideExpansionButton" and ExpansionButtonVisible == nil then
             ExpansionButtonVisible = false
-            SetButtonState()
             frame:UnregisterEvent("ADDON_LOADED")
         end
-    elseif event == "COVENANT_CALLINGS_UPDATED" then
-        -- Something fires this event and then turns the button back on after.
-        -- Since it doesn't seem to fire another event when it's done we just
-        -- have to wait an arbitrary amount of time.
-        C_Timer.After(5, SetButtonState)
     else
         SetButtonState()
     end
@@ -28,9 +24,19 @@ function SlashCmdList.HIDEEXPANSIONBUTTON(msg, editbox)
 end
 
 function SetButtonState()
+    -- Before we hide the button we save its `Show` method and then override it.
+    -- Otherwise everytime you zone to a new expansion WoW will just turn it back on.
+    -- When we need to show it again we just restore the method before calling it.
     if ExpansionButtonVisible then
+        if originalShowFunction ~= nil then
+            ExpansionLandingPageMinimapButton.Show = originalShowFunction
+        end
         ExpansionLandingPageMinimapButton:Show()
     else
         ExpansionLandingPageMinimapButton:Hide()
+        if originalShowFunction == nil then
+            originalShowFunction = ExpansionLandingPageMinimapButton.Show
+        end
+        ExpansionLandingPageMinimapButton.Show = function() end
     end
 end

HideExpansionButton.toc

@@ -1,8 +1,8 @@
-## Interface: 110002
+## Interface: 110005
 ## Title: Hide Expansion Button
-## Notes: Hides the expansion button for the current expansion
+## Notes: Hides the expansion minimap button
 ## Author: Chris Johnson
-## Version: 1.0.9
+## Version: 1.1.0
 ## SavedVariablesPerCharacter: ExpansionButtonVisible
 
 HideExpansionButton.lua