kbmulti: simplify default settings

master
Rob Pilling 2024-04-20 12:02:20 +01:00
parent 2ffb3bed2f
commit 71a1da2cfe
2 changed files with 12 additions and 9 deletions

View File

@ -5,11 +5,12 @@ exports.input = function(options) {
var text = options.text; var text = options.text;
if ("string"!=typeof text) text=""; if ("string"!=typeof text) text="";
var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {}; var settings = Object.assign({
if (settings.firstLaunch===undefined) { settings.firstLaunch = true; } firstLaunch: true,
if (settings.charTimeout===undefined) { settings.charTimeout = 500; } showHelpBtn: true,
if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; } charTimeout: 500,
if (settings.autoLowercase===undefined) { settings.autoLowercase = true; } autoLowercase: true,
}, require('Storage').readJSON("kbmulti.settings.json", true));
var fontSize = "6x15"; var fontSize = "6x15";
var Layout = require("Layout"); var Layout = require("Layout");

View File

@ -1,9 +1,11 @@
(function(back) { (function(back) {
function settings() { function settings() {
var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {}; var settings = Object.assign({
if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; } showHelpBtn: true,
if (settings.charTimeout===undefined) { settings.charTimeout = 500; } charTimeout: 500,
if (settings.autoLowercase===undefined) { settings.autoLowercase = true; } autoLowercase: true,
}, require('Storage').readJSON("kbmulti.settings.json", true));
return settings; return settings;
} }