From ee47cb5289b688b4a902e305d798cc500f098bd8 Mon Sep 17 00:00:00 2001 From: WarlockD Date: Mon, 30 Nov 2020 10:53:23 -0600 Subject: [PATCH] Removed jQuery from snowflake devices (#55090) * Removed jQuery from snowflake menus * Update code/modules/admin/verbs/beakerpanel.dm Co-authored-by: Kyle Spier-Swenson Co-authored-by: Kyle Spier-Swenson --- code/game/machinery/computer/security.dm | 19 +++++++------ code/modules/admin/verbs/beakerpanel.dm | 2 +- code/modules/asset_cache/asset_list_items.dm | 1 - code/modules/tooltip/tooltip.dm | 2 -- code/modules/tooltip/tooltip.html | 30 ++++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 17b4aa5ba5f..889535e2253 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -55,7 +55,6 @@ dat += {" - - "} - dat += {" -

"} + dat += {"

"} dat += "New Record
" //search bar dat += {" diff --git a/code/modules/admin/verbs/beakerpanel.dm b/code/modules/admin/verbs/beakerpanel.dm index 4cf16b60d14..5de270a2121 100644 --- a/code/modules/admin/verbs/beakerpanel.dm +++ b/code/modules/admin/verbs/beakerpanel.dm @@ -66,7 +66,7 @@ if(!check_rights()) return var/datum/asset/asset_datum = get_asset_datum(/datum/asset/simple/namespaced/common) - asset_datum.send() + asset_datum.send(usr.client||src) //Could somebody tell me why this isn't using the browser datum, given that it copypastes all of browser datum's html var/dat = {" diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 99a99b6bc29..98b57d09256 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -151,7 +151,6 @@ /datum/asset/simple/jquery - legacy = TRUE assets = list( "jquery.min.js" = 'html/jquery.min.js', ) diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index 3b77894f679..38b70fe7cf7 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -42,8 +42,6 @@ Notes: /datum/tooltip/New(client/C) if (C) owner = C - var/datum/asset/stuff = get_asset_datum(/datum/asset/simple/jquery) - stuff.send(owner) owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") ..() diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html index c9e031ccc2e..5da2033d089 100644 --- a/code/modules/tooltip/tooltip.html +++ b/code/modules/tooltip/tooltip.html @@ -87,8 +87,10 @@

-