Mercurial > wow > skeletonkey

diff KeyButton.lua @ 76:6623b7f2c1ca v7.1.5-78-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added: - key assignment and unbinding for inactive talents Bug Fixes: - fixed spell access check for talents - fixed detection of Legion PvP talents - fixed unbind command not clearing assigned key text - fixed frame content not loading after combat Miscellaneous: - bindings are determined from the button's assignment list - increment profile version to remove deprecated talents list
author Nenue
date Mon, 23 Jan 2017 20:07:30 -0500
parents 9824d524a661
children d4c100b0fd01
line wrap: on
line diff
--- a/KeyButton.lua	Mon Jan 23 18:59:02 2017 -0500
+++ b/KeyButton.lua	Mon Jan 23 20:07:30 2017 -0500
@@ -133,7 +133,7 @@
     if cursorType then
       self:DropToSlot()
     else
-      if self.command and self.isAvailable then
+      if self.command then
         if IsShiftKeyDown() then
           kb.db.stickyMode = true
           KeyBinderStickyMode:SetChecked(true)
@@ -421,10 +421,7 @@
   if self.actionType == 'macro' then
     talentName = GetMacroSpell(self.actionID)
   end
-    -- remove any matching talent data
-  if talentName and kb.currentProfile.talents[talentName] then
-    kb.currentProfile.talents[talentName] = nil
-  end
+
   local droppedKeys = {}
 
   -- doing removal in second loop to avoid possible iterator shenanigans
@@ -461,10 +458,6 @@
 
 end
 
-local DoMacroCheck = function(name, macroText, searchID, roughResult)
-
-  return matchID, matchName, matchBody, endOfSearch
-end
 --- Assigns the slot via table copy; any manipulations from this point are temporary and
 function skb:SetSlot(slotInfo)
   print('slot info', self:GetID())