Fix extrabutton not showing activation

Author: brittyazel

Neuron.lua

@@ -228,11 +228,6 @@ function Neuron:OnEnable()
 
 	Neuron:Overrides()
 
-	--TODO: Get rid of this in the next version
-	for k,v in pairs(NeuronItemCache) do
-		NeuronItemCache[k:lower()] = v
-	end
-
 end
 
 --- **OnDisable**, which is only called when your addon is manually being disabled.

Objects/ACTIONBUTTON_DragAndDrop.lua

@@ -485,14 +485,9 @@ end
 
 
 function ACTIONBUTTON:SetMouseCursor()
-
-	if self.spell then
-		local spellID
-		_,_,_,_,_,_,spellID = GetSpellInfo(self.spell)
-		if spellID then
-			PickupSpell(spellID) --this is to try to catch any stragglers that might not have a spellID on the button. Things like mounts and such
-		end
-		if GetCursorInfo() then --if this isn't a normal spell (like a flyout) or it is a pet abiity, revert to a question mark symbol
+	if self.spell and self.spellID then
+		PickupSpell(self.spellID)
+		if GetCursorInfo() then
 			return
 		end
 	end
@@ -502,6 +497,18 @@ function ACTIONBUTTON:SetMouseCursor()
 		if GetCursorInfo() then --if this isn't a normal spell (like a flyout) or it is a pet abiity, revert to a question mark symbol
 			return
 		end
+
+		PickupItem(GetItemInfoInstant(self.item))
+		if GetCursorInfo() then
+			return
+		end
+
+		if NeuronItemCache[self.item:lower()] then --try to pull the spellID from our ItemCache as a last resort
+			PickupItem(NeuronItemCache[self.item:lower()])
+			if GetCursorInfo() then
+				return
+			end
+		end
 	end
 
 	--failsafe so there is 'something' on the mouse cursor

Objects/BUTTON.lua

@@ -631,7 +631,9 @@ end
 -----------------------------------------------------------------------------------------
 
 function BUTTON:UpdateCount()
-	if self.spell then
+	if self.actionID then
+		self:UpdateActionCount()
+	elseif self.spell then
 		self:UpdateSpellCount()
 	elseif self.item then
 		self:UpdateItemCount()
@@ -667,6 +669,17 @@ function BUTTON:UpdateItemCount()
 	end
 end
 
+
+function BUTTON:UpdateActionCount()
+	local count = GetActionCount(self.actionID)
+
+	if count and count > 0 then
+		self.elements.Count:SetText(count)
+	else
+		self.elements.Count:SetText("")
+	end
+end
+
 -----------------------------------------------------------------------------------------
 ------------------------------------- Set Cooldown --------------------------------------
 -----------------------------------------------------------------------------------------
@@ -685,7 +698,7 @@ function BUTTON:UpdateCooldown()
 end
 
 function BUTTON:UpdateSpellCooldown()
-	if self.spell then
+	if self.spell and self.isShown then
 		local start, duration, enable, modrate = GetSpellCooldown(self.spell)
 		local charges, maxCharges, chStart, chDuration, chargemodrate = GetSpellCharges(self.spell)
 
@@ -700,7 +713,7 @@ function BUTTON:UpdateSpellCooldown()
 end
 
 function BUTTON:UpdateItemCooldown()
-	if self.item then
+	if self.item and self.isShown then
 		if NeuronItemCache[self.item] then
 			local start, duration, enable, modrate = GetItemCooldown(NeuronItemCache[self.item])
 			self:SetCooldownTimer(start, duration, enable, self.cdText, modrate, self.cdcolor1, self.cdcolor2, self.cdAlpha)
@@ -711,7 +724,7 @@ function BUTTON:UpdateItemCooldown()
 end
 
 function BUTTON:UpdateActionCooldown()
-	if self.actionID then
+	if self.actionID and self.isShown then
 		if HasAction(self.actionID) then
 			local start, duration, enable, modrate = GetActionCooldown(self.actionID)
 			self:SetCooldownTimer(start, duration, enable, self.cdText, modrate, self.cdcolor1, self.cdcolor2, self.cdAlpha)
@@ -951,7 +964,6 @@ function BUTTON:UpdateActionStatus()
 		elseif type == "item" then
 			name = GetItemInfo(id)
 		end
-
 	else
 		self:SetChecked(false)
 	end
@@ -961,7 +973,7 @@ function BUTTON:UpdateActionStatus()
 	else
 		self.elements.Name:SetText("")
 	end
-	self.elements.Count:SetText("")
+
 	self:UpdateUsable()
 end
 

Objects/EXTRABTN.lua

@@ -54,11 +54,14 @@ function EXTRABTN:SetType()
 
 	self:SetAttribute("type1", "action")
 
+	self:SetAttribute("action1", 169) --baseline actionID for most zoneability actions
+
+
 	--action content gets set in UpdateData
 	self:UpdateData()
 
 	self:SetScript("PostClick", function(self) self:UpdateStatus() end)
-	self:SetScript("OnEnter", function(self, ...) self:OnEnter(...) end)
+	self:SetScript("OnEnter", function(self) self:UpdateTooltip() end)
 	self:SetScript("OnLeave", GameTooltip_Hide)
 
 	self:SetSkinned()
@@ -76,28 +79,35 @@ end
 
 ---overwrite function in parent class BUTTON
 function EXTRABTN:UpdateData()
-	--default to 169 as is the most of then the case as of 8.1
-	self.extraActionID = 169
 
-	--get specific extrabutton extraActionID. Try to query it long form, but if it can't will fall back to 169 (as is the 7.0+ default)
+	--get specific extrabutton actionID. Try to query it long form, but if it can't will fall back to 169 (as is the 7.0+ default)
 	if HasExtraActionBar() then
+		--default to 169 as is the most of then the case as of 8.1
+		self.actionID = 169
+
 		local extraPage = GetExtraBarIndex()
-		self.extraActionID = extraPage*12 - 11 --1st slot on the extraPage (page 15 as of 8.1, so 169)
-	end
+		self.actionID = extraPage*12 - 11 --1st slot on the extraPage (page 15 as of 8.1, so 169)
 
-	if not InCombatLockdown() then
-		self:SetAttribute("action1", self.extraActionID)
-	end
+		if not InCombatLockdown() then
+			self:SetAttribute("action1", self.actionID)
+		end
 
-	-----------------------
-	_, self.spellID = GetActionInfo(self.extraActionID)
-	
-	if self.spellID then
-		self.spell = GetSpellInfo(self.spellID);
+		_, self.spellID = GetActionInfo(self.actionID)
+
+		if self.spellID then
+			self.spell = GetSpellInfo(self.spellID);
+		else
+			self.spell = nil
+		end
 	else
-		self.spell = ""
+		self.actionID = nil
+		self.spellID = nil
+		self.spell = nil
 	end
 
+	-----------------------
+	self.elements.Name:Hide()
+
 	self:UpdateObjectVisibility()
 	self:UpdateIcon()
 	self:UpdateCooldown()
@@ -132,7 +142,7 @@ function EXTRABTN:UpdateIcon()
 	end
 end
 
-function EXTRABTN:OnEnter()
+function EXTRABTN:UpdateTooltip()
 	if not self.isShown then
 		return
 	end

Objects/ZONEABILITYBTN.lua

@@ -61,7 +61,7 @@ function ZONEABILITYBTN:SetType()
 		end
 	end)
 	self:SetScript("PostClick", function(self) self:UpdateStatus() end)
-	self:SetScript("OnEnter", function(self, ...) self:OnEnter(...) end)
+	self:SetScript("OnEnter", function(self) self:UpdateTooltip() end)
 	self:SetScript("OnLeave", GameTooltip_Hide)
 
 	self:SetSkinned()
@@ -87,9 +87,11 @@ function ZONEABILITYBTN:UpdateData()
 			self:SetAttribute("macrotext1", "/cast " .. self.spell .. "();")
 		end
 	else
-		self.spell = ""
+		self.spell = nil
 	end
 
+	self.elements.Name:Hide()
+
 	self:UpdateObjectVisibility()
 	self:UpdateIcon()
 	self:UpdateCooldown()
@@ -124,7 +126,7 @@ function ZONEABILITYBTN:UpdateIcon()
 	end
 end
 
-function ZONEABILITYBTN:OnEnter()
+function ZONEABILITYBTN:UpdateTooltip()
 	if not self.isShown then
 		return
 	end