Skip to content

Commit 571a6a1

Browse files
committed
no more
1 parent 30d8620 commit 571a6a1

File tree

2 files changed

+3
-34
lines changed

2 files changed

+3
-34
lines changed

ElvUI/Core/General/StaticPopups.lua

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ local E, L, V, P, G = unpack(ElvUI)
22
local AB = E:GetModule('ActionBars')
33
local UF = E:GetModule('UnitFrames')
44
local M = E:GetModule('Misc')
5-
local B = E:GetModule('Bags')
65
local S = E:GetModule('Skins')
76

87
local _G = _G
9-
local pairs, type, unpack, assert = pairs, type, unpack, assert
10-
local tremove, tContains, tinsert, wipe = tremove, tContains, tinsert, wipe
11-
local format, error, ipairs, ceil = format, error, ipairs, ceil
8+
local pairs, type, unpack, assert, ceil = pairs, type, unpack, assert, ceil
9+
local tremove, tContains, tinsert, wipe, error = tremove, tContains, tinsert, wipe, error
1210

1311
local CreateFrame = CreateFrame
14-
local DeleteCursorItem = DeleteCursorItem
1512
local MoneyFrame_Update = MoneyFrame_Update
1613
local UnitIsDeadOrGhost, InCinematic = UnitIsDeadOrGhost, InCinematic
1714
local PurchaseSlot, GetBankSlotCost = PurchaseSlot, GetBankSlotCost
@@ -26,7 +23,6 @@ local ChatEdit_FocusActiveWindow = ChatEdit_FocusActiveWindow
2623
local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
2724
local EnableAddOn = (C_AddOns and C_AddOns.EnableAddOn) or EnableAddOn
2825
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
29-
local PickupContainerItem = (C_Container and C_Container.PickupContainerItem) or PickupContainerItem
3026

3127
local STATICPOPUP_TEXTURE_ALERT = STATICPOPUP_TEXTURE_ALERT
3228
local STATICPOPUP_TEXTURE_ALERTGEAR = STATICPOPUP_TEXTURE_ALERTGEAR
@@ -269,29 +265,6 @@ E.PopupDialogs.RESET_NP_AF = {
269265
hideOnEscape = false,
270266
}
271267

272-
E.PopupDialogs.DELETE_GRAYS = {
273-
text = format('|cffff0000%s|r', L["Delete gray items?"]),
274-
button1 = YES,
275-
button2 = NO,
276-
OnAccept = function()
277-
B:VendorGrays(true)
278-
279-
for _, info in ipairs(B.SellFrame.Info.itemList) do
280-
PickupContainerItem(info[1], info[2])
281-
DeleteCursorItem()
282-
end
283-
284-
wipe(B.SellFrame.Info.itemList)
285-
end,
286-
OnShow = function(self)
287-
MoneyFrame_Update(self.moneyFrame, E.PopupDialogs.DELETE_GRAYS.Money)
288-
end,
289-
timeout = 4,
290-
whileDead = 1,
291-
hideOnEscape = false,
292-
hasMoneyFrame = 1,
293-
}
294-
295268
E.PopupDialogs.BUY_BANK_SLOT = {
296269
text = CONFIRM_BUY_BANK_SLOT,
297270
button1 = YES,

ElvUI/Core/Modules/Bags/Bags.lua

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,12 +1465,8 @@ function B:VendorGrayCheck()
14651465
end
14661466

14671467
-- our sell grays
1468-
local value = B:GetGraysValue()
1469-
if value == 0 then
1468+
if B:GetGraysValue() == 0 then
14701469
E:Print(L["No gray items to delete."])
1471-
elseif not _G.MerchantFrame:IsShown() and not E.Retail then
1472-
E.PopupDialogs.DELETE_GRAYS.Money = value
1473-
E:StaticPopup_Show('DELETE_GRAYS')
14741470
else
14751471
B:VendorGrays()
14761472
end

0 commit comments

Comments
 (0)