Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Advanced Item Description error popup problems #8311

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Fix Advanced Item Description error popup problems #8311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e420143
show as warning, once per session
Nightblade Sep 21, 2024
a1058e6
move to keypress handling code
Nightblade Sep 22, 2024
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
4 changes: 0 additions & 4 deletions src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.rawLines = { }
-- Find non-blank lines and trim whitespace
for line in raw:gmatch("%s*([^\n]*%S)") do
if line:match("^{ ") then
main:OpenMessagePopup("Error", "\"Advanced Item Description\" (Ctrl+Alt+c) is currently unsupported.\nPlease try again using Ctrl+c only.")
return
end
t_insert(self.rawLines, line)
end
local mode = rarity and "GAME" or "WIKI"
Expand Down
5 changes: 5 additions & 0 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,11 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
if event.type == "KeyDown" then
if event.key == "v" and IsKeyDown("CTRL") then
local newItem = Paste()
if newItem:find("{ ", 0, true) then
main:OpenConfirmPopup("Warning", "\"Advanced Item Descriptions\" (Ctrl+Alt+c) are unsupported.\n\nAbort paste?", "OK", function()
self:SetDisplayItem()
end)
end
if newItem then
self:CreateDisplayItemFromRaw(newItem, true)
end
Expand Down
Loading