diff --git a/website/o3dv/cookies.js b/website/o3dv/cookies.js index ee8dc3a..3acdcb4 100644 --- a/website/o3dv/cookies.js +++ b/website/o3dv/cookies.js @@ -10,20 +10,6 @@ OV.CookieHandler = class this.SetStringVal (key, ''); } - GetBoolVal (key, defVal) - { - let stringVal = this.GetStringVal (key); - if (stringVal === null) { - return defVal; - } - return stringVal === 'true' ? true : false; - } - - SetBoolVal (key, value) - { - this.SetStringVal (key, value ? 'true' : false); - } - SetStringVal (key, value) { let date = new Date (); @@ -43,4 +29,32 @@ OV.CookieHandler = class } return null; } + + GetBoolVal (key, defVal) + { + let stringVal = this.GetStringVal (key); + if (stringVal === null) { + return defVal; + } + return stringVal === 'true' ? true : false; + } + + SetBoolVal (key, value) + { + this.SetStringVal (key, value ? 'true' : 'false'); + } + + GetColorVal (key, defVal) + { + let stringVal = this.GetStringVal (key); + if (stringVal === null) { + return defVal; + } + return OV.ParameterConverter.StringToColor (stringVal); + } + + SetColorVal (key, value) + { + this.SetStringVal (key, OV.ParameterConverter.ColorToString (value)); + } }; diff --git a/website/o3dv/website.js b/website/o3dv/website.js index 3230e18..8b9062b 100644 --- a/website/o3dv/website.js +++ b/website/o3dv/website.js @@ -225,10 +225,7 @@ OV.Website = class InitSettings () { - let defaultColorStr = this.cookieHandler.GetStringVal ('ov_default_color', null); - if (defaultColorStr !== null) { - this.importSettings.defaultColor = OV.ParameterConverter.StringToColor (defaultColorStr); - } + this.importSettings.defaultColor = this.cookieHandler.GetColorVal ('ov_default_color', new OV.Color (200, 200, 200)); } InitToolbar () @@ -330,7 +327,7 @@ OV.Website = class obj.dialog = OV.ShowSettingsDialog (obj.importSettings, function (dialogSettings) { let reload = !OV.ColorIsEqual (obj.importSettings.defaultColor, dialogSettings.defaultColor); obj.importSettings.defaultColor = dialogSettings.defaultColor; - obj.cookieHandler.SetStringVal ('ov_default_color', OV.ParameterConverter.ColorToString (obj.importSettings.defaultColor)); + obj.cookieHandler.SetColorVal ('ov_default_color', obj.importSettings.defaultColor); if (reload) { obj.ReloadFiles (); }