Mercurial > wow > reaction

comparison ActionButton.lua @ 268:c5b945c4209c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 1.1 beta 7 into stable
author Flick
date Tue, 10 May 2011 10:32:11 -0700
parents 8fde9da21652
children 36a29870bf34
comparison
equal deleted inserted replaced
264:d2e55b61e5e6 268:c5b945c4209c
121 end 121 end
122 ]] 122 ]]
123 123
124 local _onReceiveDrag = -- function(self, button, kind, value, ...) 124 local _onReceiveDrag = -- function(self, button, kind, value, ...)
125 [[ 125 [[
126 if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" then 126 if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" and kind ~= "equipmentset" and kind ~= "companion" then
127 return kind, value, ... 127 return kind, value, ...
128 else 128 else
129 if showgrid_event and showgrid_event > 0 then 129 if showgrid_event and showgrid_event > 0 then
130 self:SetAttribute("showgrid-clicked",true) 130 self:SetAttribute("showgrid-clicked",true)
131 end 131 end
156 "LEARNED_SPELL_IN_TAB", 156 "LEARNED_SPELL_IN_TAB",
157 "UPDATE_INVENTORY_ALERTS", 157 "UPDATE_INVENTORY_ALERTS",
158 "PLAYER_TARGET_CHANGED", 158 "PLAYER_TARGET_CHANGED",
159 "TRADE_SKILL_SHOW", 159 "TRADE_SKILL_SHOW",
160 "TRADE_SKILL_CLOSE", 160 "TRADE_SKILL_CLOSE",
161 "ARCHAEOLOGY_CLOSED",
161 "PLAYER_ENTER_COMBAT", 162 "PLAYER_ENTER_COMBAT",
162 "PLAYER_LEAVE_COMBAT", 163 "PLAYER_LEAVE_COMBAT",
163 "START_AUTOREPEAT_SPELL", 164 "START_AUTOREPEAT_SPELL",
164 "STOP_AUTOREPEAT_SPELL", 165 "STOP_AUTOREPEAT_SPELL",
165 "UNIT_ENTERED_VEHICLE", 166 "UNIT_ENTERED_VEHICLE",
744 end 745 end
745 746
746 function Action:TRADE_SKILL_SHOW() 747 function Action:TRADE_SKILL_SHOW()
747 self:UpdateCheckedState() 748 self:UpdateCheckedState()
748 end 749 end
749 Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_CLOSE 750 Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_SHOW
751 Action.ARCHAEOLOGY_CLOSED = Action.TRADE_SKILL_SHOW
750 752
751 function Action:UNIT_ENTERED_VEHICLE(event,unit) 753 function Action:UNIT_ENTERED_VEHICLE(event,unit)
752 if unit == "player" then 754 if unit == "player" then
753 self:UpdateCheckedState() 755 self:UpdateCheckedState()
754 end 756 end