module refactoring

This commit is contained in:
Manuel Simon Hirsig
2017-11-25 17:53:39 +01:00
parent 6f71167e48
commit ab94acc2be
38 changed files with 402 additions and 453 deletions
+7 -9
View File
@@ -1,20 +1,18 @@
module 'aux.core.shortcut'
include 'aux'
local T = require 'T'
local aux = require 'aux'
local info = require 'aux.util.info'
do
local orig = SetItemRef
_G.SetItemRef = T.vararg-function(arg)
if arg[3] ~= 'RightButton' or not index(get_active_tab(), 'CLICK_LINK') or not strfind(arg[1], '^item:%d+') then
if arg[3] ~= 'RightButton' or not aux.index(aux.get_tab(), 'CLICK_LINK') or not strfind(arg[1], '^item:%d+') then
return orig(unpack(arg))
end
local item_info = info.item(tonumber(select(3, strfind(arg[1], '^item:(%d+)'))))
local item_info = info.item(tonumber(aux.select(3, strfind(arg[1], '^item:(%d+)'))))
if item_info then
return get_active_tab().CLICK_LINK(item_info)
return aux.get_tab().CLICK_LINK(item_info)
end
end
end
@@ -22,12 +20,12 @@ end
do
local orig = UseContainerItem
_G.UseContainerItem = T.vararg-function(arg)
if modified() or not get_active_tab() then
if aux.modified() or not aux.get_tab() then
return orig(unpack(arg))
end
local item_info = info.container_item(arg[1], arg[2])
if item_info and get_active_tab().USE_ITEM then
get_active_tab().USE_ITEM(item_info)
if item_info and aux.get_tab().USE_ITEM then
aux.get_tab().USE_ITEM(item_info)
end
end
end