Skip to content

Commit 99cc92e

Browse files
author
mergetest
committed
Post-merge cleanup from the PR #221 review
Six non-blocking items from the review that were safe to fix directly. - /dfauras <unknown-unit> opened a second DF:Out writer, printing the separator rule and title twice. Reuses the one already open. - The roster monitor told the user to type /dfroster, which is no longer a bind after the one-command rework. Routed through DF:CmdPath so it stays right if roster moves between the everyday and debug listings. - COMMAND_SIBLINGS.secure.dev was missing showbutton and hidebutton, which the comment above it says must stay in step with SECURE_MUTATORS. Now 14 against 14. - L["Back"] had no readers left once the wizard runtime went; the pruning note claiming otherwise is corrected rather than just deleted. - Dangling TEST COMMANDS section header in Popup.lua with nothing under it. - Orphaned raidRoleCache comment in StatusIcons.lua. Checks: zero L[...] reads without a definition (2094 keys, 2059 uses); TOC clean both directions.
1 parent 09c5d45 commit 99cc92e

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

Core.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ DF.COMMAND_SIBLINGS = {
394394
-- SECURE_MUTATORS in Features/SecureSort.lua, which is what refuses them.
395395
-- "init" leads the dev list because every other one needs the handler.
396396
secure = { "help", "status", dev = { "init", "party", "raid", "all", "register",
397-
"test", "swap", "swapback", "debug", "ui", "show", "hide" } },
397+
"test", "swap", "swapback", "debug", "ui", "show", "hide",
398+
"showbutton", "hidebutton" } },
398399
flatraid = { "info", "reinit", "test" },
399400
-- (No "cc" entry.) /df debug cc's BARE form already prints its full subcommand
400401
-- table — that is its entire job — so a Siblings footer would repeat it.

Features/Auras.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@ SlashCmdList["DFAURAS"] = function(msg)
35983598
end)
35993599
end
36003600
if not target then
3601-
local o = DF:Out("Aura Pipeline", "unit " .. unit)
3601+
-- Reuse the writer opened above; a second DF:Out here printed the
3602+
-- separator rule and the title twice on the not-found path.
36023603
-- IterateAllFrames covers party/raid/arena, not pets or pinned sets.
36033604
o:Line("No DF party/raid/arena frame is currently driving that unit.", "WARN")
36043605
o:Line("Try player, party1..4 or raid1..40, and make sure the frames are shown.", "NEUTRAL")

Frames/Headers.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,11 @@ SlashCmdList["DFROSTER"] = function(msg)
504504
wipe(DF.RosterDebug.events)
505505
DF.RosterDebug.startTime = GetTime()
506506
DF.RosterDebug.enabled = true
507-
DF:Say("Started monitoring. Join/leave groups, then type /dfroster again to see results.")
507+
-- Via CmdPath, not a hardcoded spelling: /dfroster is no longer a bind
508+
-- after the one-command rework, and the path stays right if roster ever
509+
-- moves between the everyday and debug listings.
510+
DF:Say("Started monitoring. Join/leave groups, then run "
511+
.. DF:CmdPath("roster") .. " again to see results.")
508512
else
509513
-- Stop and report
510514
DF.RosterDebug.enabled = false

Frames/StatusIcons.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,6 @@ end
900900
-- Shows Main Tank / Main Assist assignment
901901
-- ============================================================
902902

903-
-- Cache for raid role assignments (unit -> role string)
904-
905903
function DF:UpdateRaidRoleIcon(frame)
906904
if not frame or not frame.unit or not frame.raidRoleIcon then return end
907905

Locales/enUS.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ L["Auto-switched to profile: %s"] = true
471471
L["Auto-switching disabled"] = true
472472
L["Automatically add players by role when they join your group."] = true
473473
L["Available Profiles"] = true
474-
L["Back"] = true
475474
L["Background"] = true
476475
L["Background Alpha"] = true
477476
L["Background Color"] = true
@@ -1657,8 +1656,10 @@ L["• Text Designer (Name, Health, Status & custom text)\n• Buff Stack & Dura
16571656
-- the rest of the locale orphans. ⚠ The reason given for leaving them — "pruning them
16581657
-- is the same edit across all 11 locale files" — was WRONG: the 10 translated files
16591658
-- are 9-line packager stubs holding zero keys, so a key lives in enUS.lua only.
1660-
-- "Back", "Cancel", "Next", "None", "Party" and "Raid" survived the cut because they
1659+
-- "Cancel", "Next", "None", "Party" and "Raid" survived the cut because they
16611660
-- have real readers (Popup.lua, ClickCasting/UI/BindingEditor.lua, DesignerPresets.lua).
1661+
-- "Back" was on that list in error — its only reader was the wizard runtime's step
1662+
-- navigation, which went with Popup.lua's trim, so the key is now gone too.
16621663
L["Name"] = true
16631664
L["Notice"] = true
16641665
L["Test Mode"] = true

Popup.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,3 @@ end
620620

621621
-- (Removed) DF:IsPopupShown — no callers. Consumers that care whether a dialog is
622622
-- up check their own state; nothing ever asked the popup system.
623-
624-
-- ============================================================
625-
-- TEST COMMANDS (temporary, for validation)
626-
-- ============================================================

0 commit comments

Comments
 (0)