From dbda3be396f07741f4ad14f6c72ac0c92abc1448 Mon Sep 17 00:00:00 2001 From: adrian w kirk Date: Fri, 30 Sep 2022 10:37:29 +0100 Subject: [PATCH] sliding text clock: BUGFIX - clock is blancj after 2nd settings update --- apps/slidingtext/slidingtext.js | 10 ++++++---- apps/slidingtext/slidingtext.settings.js | 5 ++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/slidingtext/slidingtext.js b/apps/slidingtext/slidingtext.js index d0e8771b4..f7597ba6f 100644 --- a/apps/slidingtext/slidingtext.js +++ b/apps/slidingtext/slidingtext.js @@ -316,12 +316,13 @@ function initDisplay(settings) { if(settings == null){ settings = {}; } - row_type_overide = date_formatter.defaultRowTypes(); + var row_type_overide = date_formatter.defaultRowTypes(); mergeMaps(row_types,row_type_overide); mergeMaps(row_types,settings.row_types); - var row_defs = (settings.row_defs != null)? settings.row_defs : date_formatter.defaultRowDefs(); - row_displays = []; + var row_defs = (settings.row_defs != null && !settings.row_defs.isEmpty())? + settings.row_defs : date_formatter.defaultRowDefs(); + row_displays = []; for(var i=0; i< row_defs.length; i++){ var row_def = row_defs[i]; var row_type_val = row_types[row_def.type]; @@ -356,8 +357,9 @@ function mergeObjects(obj1, obj2){ const heights = { - vsmall: [15,10], + vsmall: [20,15], small: [25,20], + msmall: [30,22], medium: [40,25], large: [50,40], vlarge: [60,50] diff --git a/apps/slidingtext/slidingtext.settings.js b/apps/slidingtext/slidingtext.settings.js index 59ab9774b..4a26a6218 100644 --- a/apps/slidingtext/slidingtext.settings.js +++ b/apps/slidingtext/slidingtext.settings.js @@ -14,6 +14,9 @@ row_types: { large:{ angle_to_horizontal: 90 + }, + medium: { + size: 'msmall' } }, row_defs: [ @@ -100,7 +103,7 @@ if(styling.row_types != null) settings.row_types = styling.row_types; - settings.row_defs = {}; + settings.delete("row_defs"); if(styling.row_defs != null) settings.row_defs = styling.row_defs;