cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5000 from CHOMPStation2/upstream-merge-13780

Browse Source 
[MIRROR] Loads jquery from the Server instead of a CDN
This commit is contained in:
Razgriz
2022-09-22 21:34:06 -07:00
committed by GitHub
parent 4beb1a88d0 bc460d2ca0
commit 8f931741d3
4 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/asset_cache/asset_list_items.dm
View File

@@ -154,10 +154,10 @@
// /datum/asset/simple/fontawesome // /datum/asset/simple/fontawesome
// ) // )
// /datum/asset/simple/jquery /datum/asset/simple/jquery
// assets = list( assets = list(
// "jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js', "jquery.min.js" = 'code/modules/tooltip/jquery.min.js',
// ) )
// /datum/asset/simple/goonchat // /datum/asset/simple/goonchat
// assets = list( // assets = list(
@@ -530,20 +530,5 @@
"southern_cross_nanomap_z9.png" = 'icons/_nanomaps/southern_cross_nanomap_z9.png', "southern_cross_nanomap_z9.png" = 'icons/_nanomaps/southern_cross_nanomap_z9.png',
"southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png',
"southern_cross_nanomap_z11.png" = 'icons/_nanomaps/southern_cross_nanomap_z11.png', "southern_cross_nanomap_z11.png" = 'icons/_nanomaps/southern_cross_nanomap_z11.png',
//"tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png',
//"tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png',
//"tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png',
//"tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png',
//"tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png',
//"tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png',
//"tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png',
//"tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png',
//"tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png',
//"tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png',
//"tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png',
//"tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png',
//"stellardelight_nanomap_z1.png" = 'icons/_nanomaps/sd_deck1.png',
//"stellardelight_nanomap_z2.png" = 'icons/_nanomaps/sd_deck2.png',
//"stellardelight_nanomap_z3.png" = 'icons/_nanomaps/sd_deck3.png',
// CHOMP Edit End // CHOMP Edit End
) )

5
code/modules/tooltip/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
code/modules/tooltip/tooltip.dm
View File

@@ -42,6 +42,8 @@ Notes:
/datum/tooltip/New(client/C) /datum/tooltip/New(client/C)
if (C) if (C)
owner = C owner = C
var/datum/asset/A = get_asset_datum(/datum/asset/simple/jquery)
A.send(owner)
owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]")
..() ..()
@@ -120,5 +122,3 @@ Notes:
if(istype(user)) if(istype(user))
if(user.client && user.client.tooltips) if(user.client && user.client.tooltips)
user.client.tooltips.hide() user.client.tooltips.hide()

10
code/modules/tooltip/tooltip.html
View File

@@ -65,12 +65,12 @@
.hisgrace .wrap {border-color: #7C1414;} .hisgrace .wrap {border-color: #7C1414;}
.hisgrace .content {color: #15D512; border-color: #9D1414; background-color: #861414;} .hisgrace .content {color: #15D512; border-color: #9D1414; background-color: #861414;}
/* TG: Themes */ /* TG: Themes */
/* ScreenUI */ /* ScreenUI */
.midnight .wrap {border-color: #2B2B33;} .midnight .wrap {border-color: #2B2B33;}
.midnight .content {color: #6087A0; border-color: #2B2B33; background-color: #36363C;} .midnight .content {color: #6087A0; border-color: #2B2B33; background-color: #36363C;}
.plasmafire .wrap {border-color: #21213D;} .plasmafire .wrap {border-color: #21213D;}
.plasmafire .content {color: #FFA800 ; border-color: #21213D; background-color:#1D1D36;} .plasmafire .content {color: #FFA800 ; border-color: #21213D; background-color:#1D1D36;}
@@ -85,7 +85,7 @@
.clockwork .wrap {border-color: #170800;} .clockwork .wrap {border-color: #170800;}
.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;} .clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
</style> </style>
</head> </head>
@@ -93,7 +93,7 @@
<div id="wrap" class="wrap"> <div id="wrap" class="wrap">
<div id="content" class="content"></div> <div id="content" class="content"></div>
</div> </div>
<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.3.min.js"></script> <script type="text/javascript" src="jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var tooltip = { var tooltip = {
'tileSize': 32, 'tileSize': 32,
@@ -125,7 +125,7 @@
tilesShown = tooltip.client_view_w tilesShown = tooltip.client_view_w
realIconSize = mapWidth / tilesShown, realIconSize = mapWidth / tilesShown,
resizeRatio = realIconSize / tooltip.tileSize, resizeRatio = realIconSize / tooltip.tileSize,
//Calculate letterboxing offsets //Calculate letterboxing offsets
leftOffset = (map.size.x - mapWidth) / 2, leftOffset = (map.size.x - mapWidth) / 2,
topOffset = (map.size.y - mapHeight) / 2; topOffset = (map.size.y - mapHeight) / 2;