From 518e04a6536c25f8aa181aebf576a24aacfdcae8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 23 Sep 2017 00:30:09 -0500 Subject: [PATCH] [MIRROR] Fixes game panel href token (#2898) * Fixes game panel href token * wew --- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 9 +++++++-- code/modules/admin/create_turf.dm | 2 +- html/create_object.html | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index e76385db59..93c354239b 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -6,7 +6,7 @@ create_mob_html = file2text('html/create_object.html') create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") - user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_mob;size=425x475") + user << browse(create_panel_helper(create_mob_html), "window=create_mob;size=425x475") /proc/randomize_human(mob/living/carbon/human/H) H.gender = pick(MALE, FEMALE) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index cb947355b1..73bb998231 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,3 +1,8 @@ +/datum/admins/proc/create_panel_helper(template) + var/final_html = replacetext(template, "/* ref src */", "\ref[src];[HrefToken()]") + final_html = replacetext(final_html,"/* hreftokenfield */","[HrefTokenFormField()]") + return final_html + /datum/admins/proc/create_object(mob/user) var/static/create_object_html = null if (!create_object_html) @@ -6,7 +11,7 @@ create_object_html = file2text('html/create_object.html') create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") - user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_object;size=425x475") + user << browse(create_panel_helper(create_object_html), "window=create_object;size=425x475") /datum/admins/proc/quick_create_object(mob/user) var/static/list/create_object_forms = list( @@ -23,4 +28,4 @@ html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"") create_object_forms[path] = html_form - user << browse(replacetext(html_form, "/* ref src */", "\ref[src];[HrefToken()]"), "window=qco[path];size=425x475") + user << browse(create_panel_helper(html_form), "window=qco[path];size=425x475") diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index f38b86a7b9..a25c02554e 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -6,4 +6,4 @@ create_turf_html = file2text('html/create_object.html') create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") - user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_turf;size=425x475") + user << browse(create_panel_helper(create_turf_html), "window=create_turf;size=425x475") diff --git a/html/create_object.html b/html/create_object.html index 44bf7667aa..619da3ec47 100644 --- a/html/create_object.html +++ b/html/create_object.html @@ -26,7 +26,8 @@
- + /* hreftokenfield */ + Type
Offset: