removed pickup shortcut again (annoying with other addons and use is enough

This commit is contained in:
Manuel Simon Hirsig
2016-08-09 02:57:27 +02:00
parent 4ebff963e3
commit ab7d228afa
5 changed files with 5 additions and 24 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ function private.post_auction(slot, k)
ClearCursor() ClearCursor()
ClickAuctionSellItemButton() ClickAuctionSellItemButton()
ClearCursor() ClearCursor()
aux.orig.PickupContainerItem(unpack(slot)) PickupContainerItem(unpack(slot))
ClickAuctionSellItemButton() ClickAuctionSellItemButton()
ClearCursor() ClearCursor()
+1 -1
View File
@@ -61,7 +61,7 @@ function private.move_item(from_slot, to_slot, amount, k)
ClearCursor() ClearCursor()
SplitContainerItem(from_slot[1], from_slot[2], amount) SplitContainerItem(from_slot[1], from_slot[2], amount)
aux.orig.PickupContainerItem(unpack(to_slot)) PickupContainerItem(unpack(to_slot))
return aux.control.when(function() return m.stack_size(to_slot) == expected_size end, k) return aux.control.when(function() return m.stack_size(to_slot) == expected_size end, k)
end end
+2 -12
View File
@@ -41,7 +41,7 @@ function public.tab(index, title, name)
tab.module[2].ACTIVE = function() tab.module[2].ACTIVE = function()
return tab == m.active_tab() return tab == m.active_tab()
end end
for _, handler in {'OPEN', 'CLOSE', 'CLICK_LINK', 'PICKUP_ITEM', 'USE_ITEM'} do for _, handler in {'OPEN', 'CLOSE', 'CLICK_LINK', 'USE_ITEM'} do
tab.module[3][handler] = nil tab.module[3][handler] = nil
end end
m.tabs[index] = tab m.tabs[index] = tab
@@ -111,7 +111,7 @@ function public.VARIABLES_LOADED()
btn:SetWidth(65) btn:SetWidth(65)
btn:SetHeight(24) btn:SetHeight(24)
btn:SetText('Close') btn:SetText('Close')
btn:SetScript('OnClick', m._(HideUIPanel, m.frame)) btn:SetScript('OnClick', m._(m.frame.hide, m.frame))
public.close_button = btn public.close_button = btn
end end
@@ -169,7 +169,6 @@ function m.ADDON_LOADED.Blizzard_AuctionUI()
end) end)
m.hook('GetOwnerAuctionItems', m.GetOwnerAuctionItems) m.hook('GetOwnerAuctionItems', m.GetOwnerAuctionItems)
m.hook('PickupContainerItem', m.PickupContainerItem)
m.hook('SetItemRef', m.SetItemRef) m.hook('SetItemRef', m.SetItemRef)
m.hook('UseContainerItem', m.UseContainerItem) m.hook('UseContainerItem', m.UseContainerItem)
m.hook('AuctionFrameAuctions_OnEvent', m.AuctionFrameAuctions_OnEvent) m.hook('AuctionFrameAuctions_OnEvent', m.AuctionFrameAuctions_OnEvent)
@@ -288,15 +287,6 @@ function private.SetItemRef(...)
end end
end end
function private.PickupContainerItem(...)
if m.modified() or not m.index(m.active_tab(), 'module', 1, 'PICKUP_ITEM') then
return m.orig.PickupContainerItem(unpack(arg))
end
for _, item_info in {m.info.container_item(arg[1], arg[2])} do
return m.active_tab.module[1].PICKUP_ITEM(item_info)
end
end
function private.UseContainerItem(...) function private.UseContainerItem(...)
if m.modified() or not m.index(m.active_tab(), 'module', 1, 'USE_ITEM') then if m.modified() or not m.index(m.active_tab(), 'module', 1, 'USE_ITEM') then
return m.orig.UseContainerItem(unpack(arg)) return m.orig.UseContainerItem(unpack(arg))
+1 -5
View File
@@ -31,10 +31,6 @@ function m.CLOSE()
m.frame:Hide() m.frame:Hide()
end end
function m.PICKUP_ITEM(item_info)
m.select_item(item_info.item_key)
end
function m.USE_ITEM(item_info) function m.USE_ITEM(item_info)
m.select_item(item_info.item_key) m.select_item(item_info.item_key)
end end
@@ -362,7 +358,7 @@ function private.unit_vendor_price(item_key)
if aux.info.auctionable(item_info.tooltip, nil, item_info.lootable) then if aux.info.auctionable(item_info.tooltip, nil, item_info.lootable) then
ClearCursor() ClearCursor()
aux.orig.PickupContainerItem(unpack(slot)) PickupContainerItem(unpack(slot))
ClickAuctionSellItemButton() ClickAuctionSellItemButton()
local auction_sell_item = aux.info.auction_sell_item() local auction_sell_item = aux.info.auction_sell_item()
ClearCursor() ClearCursor()
-5
View File
@@ -156,11 +156,6 @@ function m.CLICK_LINK(item_info)
m.execute(nil, false) m.execute(nil, false)
end end
function m.PICKUP_ITEM(item_info)
m.set_filter(strlower(item_info.name)..'/exact')
m.execute(nil, false)
end
function m.USE_ITEM(item_info) function m.USE_ITEM(item_info)
m.set_filter(strlower(item_info.name)..'/exact') m.set_filter(strlower(item_info.name)..'/exact')
m.execute(nil, false) m.execute(nil, false)