From 21e555a14f3a50fc870e7a352aad8358d08dec47 Mon Sep 17 00:00:00 2001 From: sarcoph <83266791+sarcoph@users.noreply.github.com> Date: Mon, 28 Feb 2022 19:34:37 -0900 Subject: [PATCH] refactoring for TGUI3, part 1 --- code/modules/cargo/console.dm | 1 - code/modules/power/monitor.dm | 2 +- tgui-back/README.md | 4 +- tgui-back/assets/tgui.js | 2 +- tgui-back/package.json | 2 +- tgui-back/src/interfaces/ntos_card.ract | 2 +- tgui/.eslintrc.yml | 2 +- tgui/packages/tgui/interfaces/AirAlarm.js | 8 +- .../interfaces/AirAlarm/AirAlarmControl.js | 15 +- .../AirAlarm/AirAlarmControlHome.js | 19 +- .../tgui/interfaces/AirlockElectronics.js | 69 +++--- tgui/packages/tgui/interfaces/Cargo.js | 123 ++++++----- tgui/packages/tgui/interfaces/Cargo/Cart.js | 23 +- .../packages/tgui/interfaces/Cargo/Catalog.js | 87 +++----- .../interfaces/Cargo/CatalogPackItemList.js | 38 ++++ .../tgui/interfaces/Cargo/Requests.js | 16 +- tgui/packages/tgui/interfaces/CargoExpress.js | 8 +- .../tgui/interfaces/CentcomPodLauncher.js | 24 +-- .../CentcomPodLauncher/CPLCloneMode.js | 4 +- .../CentcomPodLauncher/CPLDamage.js | 4 +- .../CentcomPodLauncher/CPLEffects.js | 4 +- .../CentcomPodLauncher/CPLExplosion.js | 4 +- .../CentcomPodLauncher/CPLLaunchStyle.js | 4 +- .../CentcomPodLauncher/CPLMovement.js | 4 +- .../CPLNameAndDescription.js | 4 +- .../interfaces/CentcomPodLauncher/CPLSound.js | 4 +- .../interfaces/CentcomPodLauncher/CPLStyle.js | 4 +- .../CentcomPodLauncher/CPLSupplyBay.js | 4 +- .../CentcomPodLauncher/CPLTeleportTo.js | 4 +- .../CentcomPodLauncher/CPLTimers.js | 4 +- tgui/packages/tgui/interfaces/ChemMaster.js | 2 +- .../tgui/interfaces/ShuttleManipulator.js | 200 +++++++++--------- tgui/packages/tgui/public/tgui.bundle.js | 6 +- 33 files changed, 382 insertions(+), 319 deletions(-) create mode 100644 tgui/packages/tgui/interfaces/Cargo/CatalogPackItemList.js diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 5abe6579a..f871517ab 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -171,7 +171,6 @@ return if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly) return - var/name = "*None Provided*" var/rank = "*None Provided*" var/ckey = usr.ckey diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 55853f1b1..42ab00b36 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -19,7 +19,7 @@ var/record_interval = 50 var/next_record = 0 var/is_secret_monitor = FALSE - tgui_id = "power_monitor" + tgui_id = "PowerMonitor" ui_style = "ntos" /obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. diff --git a/tgui-back/README.md b/tgui-back/README.md index 3d554952a..e3ed2a20e 100644 --- a/tgui-back/README.md +++ b/tgui-back/README.md @@ -35,7 +35,7 @@ All these examples and abstracts sound great, you might say. But you also might Examples can be as simple or as complex as you would like. Let's start with a very basic hello world. ```DM -/obj/machinery/my_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = default_state) +/obj/machinery/my_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "my_machine", name, 300, 300, master_ui, state) @@ -102,7 +102,7 @@ Templates can be very confusing at first, as ternary operators, computed propert We all do it, even the best of us. If you just want to make a tgui **fast**, here's what you need (note that you'll probably be forced to clean your shit up upon code review): ```DM -/obj/copypasta/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = default_state) // Remember to use the appropriate state. +/obj/copypasta/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) // Remember to use the appropriate state. ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "copypasta", name, 300, 300, master_ui, state) diff --git a/tgui-back/assets/tgui.js b/tgui-back/assets/tgui.js index 7f4bb214f..649f97fc0 100644 --- a/tgui-back/assets/tgui.js +++ b/tgui-back/assets/tgui.js @@ -1 +1 @@ -require=function a(o,s,p){function u(e,t){if(!s[e]){if(!o[e]){var n="function"==typeof require&&require;if(!t&&n)return n(e,!0);if(c)return c(e,!0);var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}var i=s[e]={exports:{}};o[e][0].call(i.exports,function(t){return u(o[e][1][t]||t)},i,i.exports,a,o,s,p)}return s[e].exports}for(var c="function"==typeof require&&require,t=0;t