Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions spec/System/TestItemListControl_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,33 @@ describe("ItemListControl", function()
assert.are.same({ }, itemsTab.items)
end)

it("requires confirmation before deleting unused items", function()
local control, itemsTab = newItemListControl()
local onConfirm
local deleted = false
itemsTab.GetEquippedSlotForItem = function()
return nil
end
itemsTab.DeleteItem = function()
deleted = true
end
itemsTab.build.treeTab.specList = { }
main.OpenConfirmPopup = function(_, title, message, confirmLabel, callback)
assert.are.equal("Delete Unused", title)
assert.are.equal("Are you sure you want to delete all unused items in this build?", message)
assert.are.equal("Delete", confirmLabel)
onConfirm = callback
end

control.controls.deleteUnused.onClick()

assert.is_false(deleted)

onConfirm()

assert.is_true(deleted)
end)

it("releases focus after opening an item with a double click", function()
local control, itemsTab = newItemListControl()
local item = new("Item"):Item([[
Expand Down
5 changes: 4 additions & 1 deletion src/Classes/ItemListControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function ItemListClass:ItemListControl(anchor, rect, itemsTab, forceTooltip)
itemsTab:SortItemList()
self:UpdateList()
end)
self.controls.deleteUnused = new("ButtonControl"):ButtonControl({"LEFT",self.controls.sort,"RIGHT"}, {4, 0, 84, 18}, "Del Unused", function()
local function deleteUnused()
local delList = {}
for _, itemId in pairs(itemsTab.itemOrderList) do
if not itemsTab:GetEquippedSlotForItem(itemsTab.items[itemId]) and not self:FindEquippedAbyssJewel(itemId, false) and not self:FindSocketedJewel(itemId, false) then
Expand All @@ -42,6 +42,9 @@ function ItemListClass:ItemListControl(anchor, rect, itemsTab, forceTooltip)
itemsTab:AddUndoState()
itemsTab.build.buildFlag = true
self:UpdateList()
end
self.controls.deleteUnused = new("ButtonControl"):ButtonControl({"LEFT",self.controls.sort,"RIGHT"}, {4, 0, 84, 18}, "Del Unused", function()
main:OpenConfirmPopup("Delete Unused", "Are you sure you want to delete all unused items in this build?", "Delete", deleteUnused)
end)
self.controls.deleteUnused.enabled = function()
return #self.list > 0
Expand Down
Loading