Code clean up, makes use of states PROPERLY (#12831)

* Code clean up, makes use of states PROPERLY

* I forgot how to new

* Fix

* Changelog

* 7th vueui arg is data.

* Adds check if topic is proxied by vueui

* Admin topic state refactor

Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
Karolis
2021-12-19 22:17:03 +01:00
committed by GitHub
co-authored by Werner
parent 1266fae968
commit 2aa1ca17b7
8 changed files with 34 additions and 37 deletions
@@ -16,7 +16,7 @@
var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
if(!ui)
ui = new(user, src, "admin-permissions-panel", 800, 600, "Permissions panel", state = interactive_state)
ui = new(user, src, "admin-permissions-panel", 800, 600, "Permissions panel", state = admin_state)
ui.header = "minimal"
ui.data = vueui_data_change(list(), user, ui)
+5 -9
View File
@@ -17,8 +17,8 @@
for(var/antag_type in all_antag_types)
var/datum/antagonist/A = all_antag_types[antag_type]
dat += A.get_check_antag_output(src)
var/datum/vueui/ui = new(usr, src, "?<div>[dat]</div>", 400, 500, "Round Status", list(), interactive_state)
var/datum/vueui/ui = new(usr, src, "?<div>[dat]</div>", 400, 500, "Round Status", list(), staff_state)
ui.open()
else
alert("The game hasn't started yet!")
@@ -26,11 +26,9 @@
/datum/vueui_module/player_panel
/datum/vueui_module/player_panel/ui_interact(mob/user)
if (!usr.client.holder)
return
var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
if(!ui)
ui = new(user, src, "admin-player-panel", 800, 600, "Modern player panel", state = interactive_state)
ui = new(user, src, "admin-player-panel", 800, 600, "Modern player panel", state = staff_state)
ui.header = "minimal"
ui.auto_update_content = TRUE
@@ -39,15 +37,13 @@
/datum/vueui_module/player_panel/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui)
if(!data)
. = data = list()
if(!user.client.holder)
return
var/isMod = check_rights(R_MOD|R_ADMIN, 0, user)
VUEUI_SET_CHECK(data["holder_ref"], "\ref[user.client.holder]", ., data)
VUEUI_SET_CHECK(data["ismod"], isMod, ., data)
var/list/mobs = sortmobs()
LAZYINITLIST(data["players"])
if(LAZYLEN(data["players"]) != mobs.len)
data["players"] = list()
@@ -112,4 +108,4 @@
return "Monkey"
if(isalien(M))
return "Alien"
return "Unknown"
return "Unknown"