Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix codacy-fixes induced store/retrieve bug

Browse source
This commit is contained in:
Brenden Tuck 2020-10-29 00:16:58 -04:00 • committed by Griatch
parent 6ccdca96c2
commit 0d107e31c4
1 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

46
evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
View file

@ -498,6 +498,28 @@ let goldenlayout = (function () {
} }
//
// upload the named layout to the Evennia server as an option
var uploadLayouts = function () {
if( window.Evennia.isConnected() && myLayout.isInitialised ) {
var obj = {};
// iterate over each layout, storing the json for each into our temp obj
for( const key of evenniaGoldenLayouts.keys() ) {
if( key !== "default" ) {
obj[key] = JSON.stringify( evenniaGoldenLayouts.get(key) );
}
}
// store our temp object as json out to window.options.webclientLayouts
window.options["webclientActiveLayout"] = activeLayoutName;
window.options["webclientLayouts"] = JSON.stringify( obj );
window.Evennia.msg("webclient_options", [], window.options);
}
}
// //
// //
var onRemoveLayout = function (evnt) { var onRemoveLayout = function (evnt) {
@ -507,11 +529,7 @@ let goldenlayout = (function () {
evenniaGoldenLayouts.delete(name); evenniaGoldenLayouts.delete(name);
layout.remove(); layout.remove();
if( window.Evennia.isConnected() && myLayout.isInitialised ) { uploadLayouts();
window.options["webclientActiveLayout"] = activeLayoutName;
window.options["webclientLayouts"] = JSON.stringify( evenniaGoldenLayouts );
window.Evennia.msg("webclient_options", [], window.options);
}
} }
@ -561,12 +579,7 @@ let goldenlayout = (function () {
localStorage.setItem( "evenniaGoldenLayoutSavedState", JSON.stringify( evenniaGoldenLayouts.get(name) ) ); localStorage.setItem( "evenniaGoldenLayoutSavedState", JSON.stringify( evenniaGoldenLayouts.get(name) ) );
localStorage.setItem( "evenniaGoldenLayoutSavedStateName", activeLayoutName ); localStorage.setItem( "evenniaGoldenLayoutSavedStateName", activeLayoutName );
// upload it to the server uploadLayouts();
if( window.Evennia.isConnected() && myLayout.isInitialised ) {
window.options["webclientActiveLayout"] = name;
window.options["webclientLayouts"] = JSON.stringify( evenniaGoldenLayouts );
window.Evennia.msg("webclient_options", [], window.options);
}
resetUI( evenniaGoldenLayouts.get(name) ); resetUI( evenniaGoldenLayouts.get(name) );
} }
@ -669,10 +682,13 @@ let goldenlayout = (function () {
var onGotOptions = function (args, kwargs) { var onGotOptions = function (args, kwargs) {
// Reset the UI if the JSON layout sent from the server doesn't match the client's current JSON // Reset the UI if the JSON layout sent from the server doesn't match the client's current JSON
if( "webclientLayouts" in kwargs ) { if( "webclientLayouts" in kwargs ) {
let mapping = JSON.parse( kwargs["webclientLayouts"] ); var layouts = JSON.parse( kwargs["webclientLayouts"] );
evenniaGoldenLayouts = new Map();
for( var layout in mapping ) { // deserialize key/layout pairs into evenniaGoldenLayouts
evenniaGoldenLayouts.set( layout, mapping[layout] ); for( var key in layouts ) {
if( key !== "default" && layouts.hasOwnProperty(key) ) { // codacy.com guard-rail
evenniaGoldenLayouts.set( key, JSON.parse(layouts[key]) );
}
} }
} }
} }