Dusk/TurtleMail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactorings

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-02-22 10:12:12 +01:00
parent cf0bff6703
commit a3e02ec3d5
2 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Postal.lua
+3 -39
View File
@@ -163,7 +163,6 @@ function Postal:OnEnable()
self:Hook('SendMailFrame_CanSend')
self:Hook('ContainerFrame_Update')
self:Hook('InboxFrame_OnClick')
self:HookScript(TradeFrame, 'OnShow', 'TF_Show')
self:Hook('InboxFrameItem_OnEnter')
self:Hook('InboxFrame_Update')
@@ -270,7 +269,7 @@ function Postal:ContainerFrameItemButton_OnClick(btn, ignore)
end
function Postal:PickupContainerItem(bag, slot)
if (self:SelectedAttachment(bag, slot) or (Postal_itemToTrade and Postal_itemToTrade[1] == bag and Postal_itemToTrade[2] == slot)) then
if self:SelectedAttachment(bag, slot) then
return
end
if not CursorHasItem() then
@@ -285,7 +284,7 @@ function Postal:UseContainerItem(bag, slot)
return self.hooks["UseContainerItem"].orig(bag, slot)
end
if self:SelectedAttachment(bag, slot) or (Postal_itemToTrade and Postal_itemToTrade[1] == bag and Postal_itemToTrade[2] == slot) then
if self:SelectedAttachment(bag, slot) then
return
end
if not CursorHasItem() then
@@ -315,15 +314,6 @@ function Postal:UseContainerItem(bag, slot)
return
end
end
elseif not CursorHasItem() and (not TradeFrame or not TradeFrame:IsVisible()) and (not AuctionFrame or not AuctionFrame:IsVisible()) and UnitExists("target") and CheckInteractDistance("target", 2) and UnitIsFriend("player", "target") and UnitIsPlayer("target") then
InitiateTrade("target")
Postal_itemToTrade = { bag, slot, UnitName("target"), 2 }
for i = 1, NUM_CONTAINER_FRAMES do
if getglobal("ContainerFrame" .. i):IsVisible() then
ContainerFrame_Update(getglobal("ContainerFrame" .. i))
end
end
return
end
self.hooks["UseContainerItem"].orig(bag, slot)
@@ -518,8 +508,7 @@ function Postal:ContainerFrame_Update(frame)
for j=1, frame.size, 1 do
local itemButton = getglobal(name.."Item"..j)
local bag, slot = itemButton:GetParent():GetID(), itemButton:GetID()
local locked = self:SelectedAttachment(bag, slot) or self:QueuedAttachment(bag, slot) or (Postal_itemToTrade and Postal_itemToTrade[1] == bag and Postal_itemToTrade[2] == slot)
if locked then
if self:SelectedAttachment(bag, slot) or self:QueuedAttachment(bag, slot) then
SetItemButtonDesaturated(itemButton, true, 0.5, 0.5, 0.5)
end
end
@@ -560,30 +549,6 @@ function Postal:InboxFrameItem_OnEnter()
GameTooltip:Show()
end
function Postal:TF_Show()
self.hooks[TradeFrame].OnShow.orig()
if Postal_itemToTrade and not CursorHasItem() and UnitName("NPC") == Postal_itemToTrade[3] then
self.hooks["PickupContainerItem"].orig(Postal_itemToTrade[1], Postal_itemToTrade[2])
ClickTradeButton(1)
end
Postal_itemToTrade = nil
end
function Postal:Inbox_OnUpdate(elapsed)
if Postal_itemToTrade then
Postal_itemToTrade[4] = Postal_itemToTrade[4] - elapsed
if Postal_itemToTrade[4] <= 0 then
Postal_itemToTrade = nil
for i = 1, NUM_CONTAINER_FRAMES do
if getglobal("ContainerFrame" .. i):IsVisible() then
ContainerFrame_Update(getglobal("ContainerFrame" .. i))
end
end
end
end
end
function Postal:UI_ERROR_MESSAGE()
if event == "UI_ERROR_MESSAGE" and (arg1 == ERR_INV_FULL or arg1 == ERR_ITEM_MAX_COUNT) then
if this.num then
@@ -683,6 +648,5 @@ function Postal:Inbox_Abort()
Postal.open.stop()
PostalInboxFrame.opening = false
Postal:Inbox_DisableClicks()
PostalInboxFrame.id = {}
Postal_SelectedItems = {}
end
Postal.xml
-5
View File
@@ -207,11 +207,6 @@ C:\Projects\WoW\Bin\Interface\FrameXML\UI.xsd">
</Frame>
<Frame name="PostalInboxFrame" parent="UIParent">
<Scripts>
<OnUpdate>
Postal:Inbox_OnUpdate(arg1)
</OnUpdate>
</Scripts>
</Frame>
<CheckButton name="PostalBoxItemCBTemplate" hidden="true" virtual="true" inherits="OptionsCheckButtonTemplate">
<HitRectInsets>