clean up fix bug loading basalrender from localstorage

This commit is contained in:
Jason Calabrese
2015-10-27 20:25:57 -07:00
parent 7c3cc6d3dd
commit d8f77437a5
2 changed files with 4 additions and 3 deletions
+4 -2
View File
@@ -92,6 +92,7 @@ function init (client, plugins, serverSettings, $) {
settings.eachSetting(function clearEachSetting (name) {
storage.remove(name);
});
storage.remove('basalrender');
event.preventDefault();
client.browserUtils.reload();
});
@@ -150,14 +151,15 @@ function init (client, plugins, serverSettings, $) {
try {
settings.eachSetting(function setEach (name) {
var stored = storage.get(name);
return stored !== undefined && stored !== null ? storage.get(name) : serverSettings.settings[name];
return stored !== undefined && stored !== null ? stored : serverSettings.settings[name];
});
if (!settings.extendedSettings.basal) {
settings.extendedSettings.basal = {};
}
settings.extendedSettings.basal.render = storage.get('basalrender');
var stored = storage.get('basalrender');
settings.extendedSettings.basal.render = stored !== null ? stored : settings.extendedSettings.basal.render;
} catch(err) {
console.error(err);
showLocalstorageError();
-1
View File
@@ -500,7 +500,6 @@ function init (client, d3) {
renderer.addBasals = function addBasals (client) {
console.info('>>>>>>basal.render', client.settings.extendedSettings.basal);
var mode = client.settings.extendedSettings.basal.render;
var profile = client.sbx.data.profile;
var linedata = [];