diff SkeletonKey/BindingsFrame.lua @ 30:b0e4d04d428a

- use a fixed loop to parse GetProfessions() result so unlearned secondaries don't break the cache - removed a bad varaible reference that was causing confirmation popup to barf
author Nenue
date Fri, 05 Aug 2016 19:41:18 -0400
parents 73df13211b22
children daff39af0c6d
line wrap: on
line diff
--- a/SkeletonKey/BindingsFrame.lua	Fri Aug 05 12:25:18 2016 -0400
+++ b/SkeletonKey/BindingsFrame.lua	Fri Aug 05 19:41:18 2016 -0400
@@ -69,13 +69,16 @@
     if cursorType then
       kb.DropToSlot(self)
     else
-      if IsShiftKeyDown() then
-        kb.db.stickyMode = true
-        KeyBinderStickyMode:SetChecked(true)
+      if self.command and self.isAvailable then
+        if IsShiftKeyDown() then
+          kb.db.stickyMode = true
+          KeyBinderStickyMode:SetChecked(true)
+        end
+
+        kb.ActivateSlot(self)
+        kb.ui()
       end
 
-      kb.ActivateSlot(self)
-      kb.ui()
     end
   elseif click == 'RightButton' then
     kb.ReleaseSlot(self)
@@ -446,7 +449,7 @@
 
 kb.AcceptAssignment = function(self, ...)
   local popup = StaticPopupDialogs["SKELETONKEY_CONFIRM_ASSIGN_SLOT"]
-  local source = loadedProfiles[popup.oldProfile]
+  local source = kb.  loadedProfiles[popup.oldProfile]
   kb.SetSlot(popup.slot, unpack(popup.args))
   kb.UpdateSlot(popup.slot)
   kb:SetScript('OnMouseWheel', KeyBinder_OnMouseWheel) -- re-enable scrolling