From ab01003ae63fb37262cf8eea6d52a3a6df279b39 Mon Sep 17 00:00:00 2001 From: PeekabooSteam Date: Thu, 23 Mar 2023 10:02:03 +0000 Subject: [PATCH] Ground units' name no longer repeats, unit name now dynamic. --- client/src/panels/unitcontrolpanel.ts | 19 +++++++++++++++++-- client/views/unitcontrolpanel.ejs | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts index 49cd7386..ed835b67 100644 --- a/client/src/panels/unitcontrolpanel.ts +++ b/client/src/panels/unitcontrolpanel.ts @@ -77,19 +77,34 @@ export class UnitControlPanel extends Panel { } var button = document.createElement("button"); - button.innerText = baseData.unitName; + + let callsign; + + const unitName = this.getElement().querySelector( "#unit-name" ); if (unit instanceof Aircraft) { button.innerText = ""; button.setAttribute( "data-short-label", aircraftDatabase.getLabelByName( baseData.name ) ); - button.setAttribute( "data-callsign", aircraftDatabase.getLabelByName( baseData.unitName ) ); + + callsign = aircraftDatabase.getLabelByName( baseData.unitName ); + + button.setAttribute( "data-callsign", callsign ); + unitName.value = callsign; + } else if (unit instanceof GroundUnit) { button.setAttribute( "data-short-label", groundUnitsDatabase.getShortLabelByName(baseData.name)); + + callsign = aircraftDatabase.getLabelByName( baseData.unitName ) || ""; + button.setAttribute( "data-callsign", groundUnitsDatabase.getLabelByName( baseData.unitName ) ); + unitName.value = callsign; + } else { + button.setAttribute( "data-short-label", ""); button.setAttribute( "data-callsign", "" ); + } button.setAttribute( "data-coalition", unit.getMissionData().coalition ); diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs index 0c8574a7..573dabed 100644 --- a/client/views/unitcontrolpanel.ejs +++ b/client/views/unitcontrolpanel.ejs @@ -8,7 +8,7 @@
- +