Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2

Send jquery asset when initializing tooltips
This commit is contained in:
oranges
2018-05-14 16:51:20 -05:00
committed by letterjay
parent f9f42658e1
commit ef7be078b5
2 changed files with 14 additions and 5 deletions
+12 -5
View File
@@ -157,9 +157,7 @@ GLOBAL_LIST_EMPTY(asset_datums)
//get an assetdatum or make a new one //get an assetdatum or make a new one
/proc/get_asset_datum(var/type) /proc/get_asset_datum(var/type)
if (!(type in GLOB.asset_datums)) return GLOB.asset_datums[type] || new type()
return new type()
return GLOB.asset_datums[type]
/datum/asset /datum/asset
var/_abstract = /datum/asset var/_abstract = /datum/asset
@@ -496,12 +494,21 @@ GLOBAL_LIST_EMPTY(asset_datums)
) )
/datum/asset/group/goonchat /datum/asset/group/goonchat
children = list(/datum/asset/simple/goonchat, /datum/asset/spritesheet/goonchat) children = list(
/datum/asset/simple/jquery,
/datum/asset/simple/goonchat,
/datum/asset/spritesheet/goonchat
)
/datum/asset/simple/jquery
verify = FALSE
assets = list(
"jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js',
)
/datum/asset/simple/goonchat /datum/asset/simple/goonchat
verify = FALSE verify = FALSE
assets = list( assets = list(
"jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js',
"json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js', "json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js',
"errorHandler.js" = 'code/modules/goonchat/browserassets/js/errorHandler.js', "errorHandler.js" = 'code/modules/goonchat/browserassets/js/errorHandler.js',
"browserOutput.js" = 'code/modules/goonchat/browserassets/js/browserOutput.js', "browserOutput.js" = 'code/modules/goonchat/browserassets/js/browserOutput.js',
+2
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/stuff = get_asset_datum(/datum/asset/simple/jquery)
stuff.send(owner)
owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]")
..() ..()